Merge remote-tracking branch 'upstream/master' ...

...into edge-dind
chore: bump dind to 20.11.11
2022-04-01 20:34:31 +02:00 · 2022-02-21 02:16:08 +01:00 · 2021-11-04 22:24:32 +01:00 · 2021-10-22 14:34:35 +02:00 · 2021-06-08 22:32:45 +02:00 · 2021-04-13 10:00:07 +02:00
5 changed files with 21 additions and 1430 deletions
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@ -4,47 +4,7 @@ local pipeline = import 'pipeline.libsonnet';
  pipeline.test('linux', 'amd64'),

  pipeline.build('docker', 'linux', 'amd64'),
-  pipeline.build('docker', 'linux', 'arm64'),
-  pipeline.build('docker', 'linux', 'arm'),
  pipeline.notifications('docker', depends_on=[
    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('gcr', 'linux', 'amd64'),
-  pipeline.build('gcr', 'linux', 'arm64'),
-  pipeline.build('gcr', 'linux', 'arm'),
-  pipeline.notifications('gcr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('acr', 'linux', 'amd64'),
-  pipeline.build('acr', 'linux', 'arm64'),
-  pipeline.build('acr', 'linux', 'arm'),
-  pipeline.notifications('acr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('ecr', 'linux', 'amd64'),
-  pipeline.build('ecr', 'linux', 'arm64'),
-  pipeline.build('ecr', 'linux', 'arm'),
-  pipeline.notifications('ecr', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
-  ]),
-
-  pipeline.build('heroku', 'linux', 'amd64'),
-  pipeline.build('heroku', 'linux', 'arm64'),
-  pipeline.build('heroku', 'linux', 'arm'),
-  pipeline.notifications('heroku', depends_on=[
-    'linux-amd64',
-    'linux-arm64',
-    'linux-arm',
  ]),
 ]
--- a/.drone.yml
+++ b/.drone.yml
@ -34,412 +34,11 @@ volumes:
 trigger:
  ref:
  - refs/heads/master
+  - refs/heads/edge-dind
+  - refs/heads/feature-*
  - "refs/tags/**"
  - "refs/pull/**"

---
-kind: pipeline
-type: ssh
-name: windows-1809-docker
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: docker
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: docker
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1809-ecr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-docker
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1809-gcr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-ecr
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1809-acr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1809.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1809
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1809
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-  - windows-1809-gcr
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1909-docker
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: docker
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: docker
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1909-ecr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: ecr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1909-gcr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: gcr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
---
-kind: pipeline
-type: ssh
-name: windows-1909-acr
-
-platform:
-  os: windows
-
-server:
-  host: windows.1909.amd64.plugins.drone.ci
-  password:
-    from_secret: windows_password
-  user:
-    from_secret: windows_username
-
-steps:
- name: build_latest
-  environment:
-    VERSION: 1909
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/latest.ps1
-  when:
-    event: [ push ]
-
- name: build_tag
-  environment:
-    VERSION: 1909
-    REGISTRY: acr
-    USERNAME:
-      from_secret: docker_username
-    PASSWORD:
-      from_secret: docker_password
-  commands:
-  - powershell.exe scripts/windows/tag.ps1
-  when:
-    event: [ tag ]
-
-depends_on:
-  - testing
-
-trigger:
-  ref:
-  - refs/heads/master
-  - refs/tags/*
-
 ---
 kind: pipeline
 name: linux-amd64-docker
@ -480,16 +79,22 @@ steps:
 - name: publish
  image: plugins/docker:18
  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
    daemon_off: false
    dockerfile: docker/docker/Dockerfile.linux.amd64
-    password:
-      from_secret: docker_password
-    repo: plugins/docker
+    tags:
+      - latest
+      - edge-dind
+      - linux-amd64
+      - ${DRONE_COMMIT_SHA:0:8}
+      - ${DRONE_COMMIT_SHA:0:8}-edge-dind
+      - ${DRONE_COMMIT_SHA:0:8}-linux-amd64
+    repo: immawanderer/drone-docker
    username:
      from_secret: docker_username
+    password:
+      from_secret: docker_password
  when:
+    branch: [edge-dind]
    event:
      exclude:
      - pull_request
@ -497,989 +102,12 @@ steps:
 trigger:
  ref:
  - refs/heads/master
+  - refs/heads/edge-dind
+  - refs/heads/feature-*
  - "refs/tags/**"
  - "refs/pull/**"

 depends_on:
 - testing

---
-kind: pipeline
-name: linux-arm64-docker
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm64/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: executable
-  image: golang:1.17.3
-  commands:
-  - ./release/linux/arm64/drone-docker --help
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/docker/Dockerfile.linux.arm64
-    password:
-      from_secret: docker_password
-    repo: plugins/docker
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- testing
-
---
-kind: pipeline
-name: linux-arm-docker
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-docker ./cmd/drone-docker"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: executable
-  image: golang:1.17.3
-  commands:
-  - ./release/linux/arm/drone-docker --help
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/docker/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/docker
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- testing
-
---
-kind: pipeline
-name: notifications-docker
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/docker/manifest.tmpl
-    username:
-      from_secret: docker_username
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-
-depends_on:
- windows-1809-docker
- windows-1909-docker
- linux-amd64-docker
- linux-arm64-docker
- linux-arm-docker
-
---
-kind: pipeline
-name: linux-amd64-gcr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/amd64/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/amd64/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.amd64
-    password:
-      from_secret: docker_password
-    repo: plugins/gcr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-amd64-docker
-
---
-kind: pipeline
-name: linux-arm64-gcr
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm64/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm64/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.arm64
-    password:
-      from_secret: docker_password
-    repo: plugins/gcr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm64-docker
-
---
-kind: pipeline
-name: linux-arm-gcr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-gcr ./cmd/drone-gcr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/gcr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/gcr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm-docker
-
---
-kind: pipeline
-name: notifications-gcr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/gcr/manifest.tmpl
-    username:
-      from_secret: docker_username
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-
-depends_on:
- windows-1809-gcr
- windows-1909-gcr
- linux-amd64-gcr
- linux-arm64-gcr
- linux-arm-gcr
-
---
-kind: pipeline
-name: linux-amd64-ecr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/amd64/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/amd64/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    daemon_off: false
-    dockerfile: docker/ecr/Dockerfile.linux.amd64
-    password:
-      from_secret: docker_password
-    repo: plugins/ecr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-amd64-docker
-
---
-kind: pipeline
-name: linux-arm64-ecr
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm64/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm64/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/ecr/Dockerfile.linux.arm64
-    password:
-      from_secret: docker_password
-    repo: plugins/ecr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm64-docker
-
---
-kind: pipeline
-name: linux-arm-ecr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-ecr ./cmd/drone-ecr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/ecr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/ecr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm-docker
-
---
-kind: pipeline
-name: notifications-ecr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/ecr/manifest.tmpl
-    username:
-      from_secret: docker_username
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-
-depends_on:
- windows-1809-ecr
- windows-1909-ecr
- linux-amd64-ecr
- linux-arm64-ecr
- linux-arm-ecr
-
---
-kind: pipeline
-name: linux-amd64-heroku
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/amd64/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    daemon_off: false
-    dockerfile: docker/heroku/Dockerfile.linux.amd64
-    password:
-      from_secret: docker_password
-    repo: plugins/heroku
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-amd64-docker
-
---
-kind: pipeline
-name: linux-arm64-heroku
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm64/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/heroku/Dockerfile.linux.arm64
-    password:
-      from_secret: docker_password
-    repo: plugins/heroku
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm64-docker
-
---
-kind: pipeline
-name: linux-arm-heroku
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_COMMIT_SHA:0:8}\" -a -tags netgo -o release/linux/arm/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v}\" -a -tags netgo -o release/linux/arm/drone-heroku ./cmd/drone-heroku"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/heroku/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/heroku
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm-docker
-
---
-kind: pipeline
-name: notifications-heroku
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: manifest
-  image: plugins/manifest
-  settings:
-    auto_tag: true
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/heroku/manifest.tmpl
-    username:
-      from_secret: docker_username
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-
-depends_on:
- linux-amd64-heroku
- linux-arm64-heroku
- linux-arm-heroku
-
---
-kind: pipeline
-name: linux-amd64-acr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/amd64/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/amd64/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-amd64
-    daemon_off: false
-    dockerfile: docker/acr/Dockerfile.linux.amd64
-    password:
-      from_secret: docker_password
-    repo: plugins/acr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-amd64-docker
-
---
-kind: pipeline
-name: linux-arm64-acr
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm64/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm64/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm64
-    daemon_off: false
-    dockerfile: docker/acr/Dockerfile.linux.arm64
-    password:
-      from_secret: docker_password
-    repo: plugins/acr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm64-docker
-
---
-kind: pipeline
-name: linux-arm-acr
-
-platform:
-  os: linux
-  arch: arm
-
-steps:
- name: build-push
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-      exclude:
-      - tag
-
- name: build-tag
-  image: golang:1.17.3
-  commands:
-  - "go build -v -ldflags \"-X main.version=${DRONE_TAG##v} -X main.build=${DRONE_BUILD_NUMBER}\" -a -tags netgo -o release/linux/arm/drone-acr ./cmd/drone-acr"
-  environment:
-    CGO_ENABLED: 0
-    GO111MODULE: on
-  when:
-    event:
-    - tag
-
- name: publish
-  image: plugins/docker:18
-  settings:
-    auto_tag: true
-    auto_tag_suffix: linux-arm
-    daemon_off: false
-    dockerfile: docker/acr/Dockerfile.linux.arm
-    password:
-      from_secret: docker_password
-    repo: plugins/acr
-    username:
-      from_secret: docker_username
-  when:
-    event:
-      exclude:
-      - pull_request
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-  - "refs/pull/**"
-
-depends_on:
- linux-arm-docker
-
---
-kind: pipeline
-name: notifications-acr
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
- name: manifest
-  image: plugins/manifest
-  settings:
-    ignore_missing: true
-    password:
-      from_secret: docker_password
-    spec: docker/acr/manifest.tmpl
-    username:
-      from_secret: docker_username
-
-trigger:
-  ref:
-  - refs/heads/master
-  - "refs/tags/**"
-
-depends_on:
- windows-1809-acr
- windows-1909-acr
- linux-amd64-acr
- linux-arm64-acr
- linux-arm-acr
-
 ...
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -53,8 +53,11 @@

 **Merged pull requests:**

+<<<<<<< HEAD
+=======
 - \(maint\) bump git to 1.13 for build and test [\#338](https://github.com/drone-plugins/drone-docker/pull/338) ([tphoney](https://github.com/tphoney))
 - \(maint\) v19.03.9 release prep [\#337](https://github.com/drone-plugins/drone-docker/pull/337) ([tphoney](https://github.com/tphoney))
+>>>>>>> upstream/master
 - \(maint\) CI, remove the dry run steps, due to rate limiting [\#323](https://github.com/drone-plugins/drone-docker/pull/323) ([tphoney](https://github.com/tphoney))
 - Update seccomp to 20.10 docker [\#322](https://github.com/drone-plugins/drone-docker/pull/322) ([techknowlogick](https://github.com/techknowlogick))

--- a/docker.go
+++ b/docker.go
@ -138,10 +138,10 @@ func (p Plugin) Exec() error {

 	// create Auth Config File
 	if p.Login.Config != "" {
-		os.MkdirAll(dockerHome, 0600)
+		os.MkdirAll(dockerHome, 0o600)

 		path := filepath.Join(dockerHome, "config.json")
-		err := ioutil.WriteFile(path, []byte(p.Login.Config), 0600)
+		err := ioutil.WriteFile(path, []byte(p.Login.Config), 0o600)
 		if err != nil {
 			return fmt.Errorf("Error writing config.json: %s", err)
 		}
--- a/docker/docker/Dockerfile.linux.amd64
+++ b/docker/docker/Dockerfile.linux.amd64
@ -1,4 +1,4 @@
-FROM docker:20.10.9-dind
+FROM docker:20.11.11-dind

 ENV DOCKER_HOST=unix:///var/run/docker.sock
Author	SHA1	Message	Date
surtur	c7b4b0c4f7	Merge remote-tracking branch 'upstream/master' ... Some checks failed continuous-integration/drone/push Build is failing Details ...into edge-dind	2022-04-01 20:34:31 +02:00
surtur	aa80cf46f3	chore: bump dind to 20.11.11 Some checks failed continuous-integration/drone/push Build is failing Details	2022-02-21 02:16:08 +01:00
surtur	984e78e4c7	chore: bump dind to 20.10.10 All checks were successful continuous-integration/drone/push Build is passing Details	2021-11-04 22:24:32 +01:00
surtur	3e0e3c8cb5	bump dind to 20.10.9 All checks were successful continuous-integration/drone/push Build is passing Details rebased on master + applied the previous changes commit b96d5245e363b8e465c95fde3dd7d3a00078da07 Author: surtur <a_mirre@utb.cz> Date: Fri Oct 22 14:28:24 2021 +0200 chore: bump dind to 20.10.9 commit ca9cfe9733edef3df9ecae19d51976ea6371baf5 Author: surtur <a_mirre@utb.cz> Date: Tue Jun 8 22:32:45 2021 +0200 chore: bump docker to 20.10.7-dind commit 5dc2b561ae0cc0e75cf7f8ec78daeb0f1b2eafcd Author: surtur <a_mirre@utb.cz> Date: Tue Apr 13 10:00:07 2021 +0200 chore: bump docker to 20.10.6-dind commit 6dc63b2b1d7ec133ae2b4a210f625364faa973b1 Author: surtur <a_mirre@utb.cz> Date: Wed Mar 17 02:35:29 2021 +0100 chore: bump docker to 20.10.5-dind commit 1ae4536a1e38d54e3d29812b70e52fabd25530b7 Author: surtur <a_mirre@utb.cz> Date: Wed Mar 17 01:11:36 2021 +0100 docker: add multiple different image tags rolling: * latest * edge-dind fixed to a commit: * ${DRONE_COMMIT_SHA:0:8} * ${DRONE_COMMIT_SHA:0:8}-edge-dind * ${DRONE_COMMIT_SHA:0:8}-linux-amd64 commit 6b86978633e0b5ba039bb5139a4f9d83ce5b0e35 Author: surtur <a_mirre@utb.cz> Date: Wed Mar 17 02:22:36 2021 +0100 ci: use plugins/docker:linux-amd64 * bump from :18 * add repo tag for dry_run commit 2a52c7ee365d4e05d6657fe0481af4c073c59d62 Author: surtur <a_mirre@utb.cz> Date: Tue Mar 16 22:26:30 2021 +0100 chore: bump docker to 19.03.15-dind commit e5693c332a0e81366085ce9508590242f5e79f5a Author: surtur <a_mirre@utb.cz> Date: Tue Mar 16 21:53:51 2021 +0100 ci: dry-run on push+publish to immawanderer commit 07c40b46a61421b1c3a6aa6bc4edaf089631c360 Author: surtur <a_mirre@utb.cz> Date: Tue Mar 16 19:59:34 2021 +0100 jsonnet: thow out {arm,gcr,acr,heroku} stuff commit f0056159bf98e9130d1af882f08fdde2e382629c Author: surtur <a_mirre@utb.cz> Date: Tue Mar 16 19:26:12 2021 +0100 ci: edit .drone.yml to only build for linux-amd64 * rm windows pipelines as I don't have any windows runners * rm arm/arm64 pipelines as I don't have any arm runners * rm {ecr,acr,whatever} publish steps as we're not publishing anything just yet * tag the image under immawanderer, not the official plugins repo * run as a dry_run (cause we're not really publishing, right?) commit 6ec5e7141117e1489faa378b1c00e459d789642d Merge: 88f8bf1 0911e6a Author: TP Honey <tp@harness.io> Date: Wed Oct 13 17:19:30 2021 +0100 Merge pull request #338 from tphoney/bump-go-1.13 (maint) bump git to 1.13 for build and test commit 0911e6a922663d52e1d9e4dfdee51a383d2b95fa Author: TP Honey <tp@harness.io> Date: Wed Oct 13 14:49:29 2021 +0100 (maint) bump git to 1.13 for build and test commit 88f8bf1cb0c41297dbe8f5bb5ff1006b51a9f718 Merge: 607b04a 2d70a1f Author: TP Honey <tp@harness.io> Date: Wed Oct 13 14:32:03 2021 +0100 Merge pull request #337 from tphoney/prep_v19.03.9 (maint) v19.03.9 release prep commit 2d70a1fa7cb4a8f2afe38cad3a1984804f1df464 Author: TP Honey <tp@harness.io> Date: Wed Oct 13 14:24:58 2021 +0100 (maint) v19.03.9 release prep commit 607b04a8719332e8bbef6ff76ac26e30715df060 Merge: 72ef7b1 e44c2d4 Author: Eoin McAfee <83226740+eoinmcafee00@users.noreply.github.com> Date: Thu Sep 23 15:52:24 2021 +0100 Merge pull request #333 from jimsheldon/ecr-externalid adding support for externalId commit e44c2d46eafd5f223ac246eb003bc6b3427b3374 Author: Jim Sheldon <jim.sheldon@meltwater.com> Date: Fri Sep 17 15:33:05 2021 -0400 adding support for externalId commit 72ef7b1f3fa6c47c58f33ca312bdc8c484b6c5a4 Author: Brad Rydzewski <bradley.rydzewski@harness.io> Date: Mon Aug 2 22:15:39 2021 -0400 log available credentials before login commit fbbeec5a2e5845e488100da3885dc630fa3468fe Author: Brad Rydzewski <bradley.rydzewski@harness.io> Date: Mon Aug 2 21:42:22 2021 -0400 use Replace instead of ReplaceAll commit b1d8698d1c5eb834b0703939e1001d23152300d2 Author: Brad Rydzewski <bradley.rydzewski@harness.io> Date: Mon Aug 2 21:28:37 2021 -0400 print login failure reason to output commit d4cf9f20f175ae550b11e0eeb44604c6d71bee20 Author: Brad Rydzewski <brad.rydzewski@gmail.com> Date: Sun Jul 11 15:50:43 2021 -0400 remove pull always commit f75380013d16585f4e4038483d6b948f0c025ff4 Merge: dd359df c10d367 Author: Brad Rydzewski <brad.rydzewski@gmail.com> Date: Sun Jul 11 15:39:35 2021 -0400 Merge pull request #325 from drone-plugins/revert-322-update-seccomp Revert "Update seccomp to 20.10 docker" commit c10d36754ccf53341f462a2e9f703315cc31f0cf Author: Brad Rydzewski <brad.rydzewski@gmail.com> Date: Sun Jul 11 15:38:04 2021 -0400 Revert "Update seccomp to 20.10 docker (#322)" This reverts commit dd359dfc7242b257f0f2078f1ef9027391d0bd0a. commit dd359dfc7242b257f0f2078f1ef9027391d0bd0a Author: techknowlogick <matti@mdranta.net> Date: Wed Jul 7 15:03:54 2021 -0400 Update seccomp to 20.10 docker (#322) * Update seccomp to 20.10 docker commit 729aa5d300a4085cfa6e0e8776368710a7fa96be Merge: f08821b db5c216 Author: TP Honey <tp@harness.io> Date: Wed Jul 7 19:52:19 2021 +0100 Merge pull request #323 from tphoney/docker_rate_limit (maint) CI, remove the dry run steps, due to rate limiting commit db5c2161febe6292386d9dc7dd8e20047219d15e Author: TP Honey <tp@harness.io> Date: Wed Jul 7 19:37:30 2021 +0100 (maint) CI, remove the dry run steps, due to rate limiting commit f08821b02496bfa8814d688523e170156050128f Merge: 0f6bd8a 5760e7b Author: Brad Rydzewski <brad.rydzewski@gmail.com> Date: Tue Apr 6 15:55:56 2021 -0400 Merge pull request #300 from rvoitenko/ecr_scan_on_push ECR: adding setting to enable image scanning while repo creation commit 5760e7b4e821a89805454f614cf2635f7ff7dc96 Merge: 3501d9a 7ade37a Author: Roman Voitenko <r00mka@gmail.com> Date: Sat Feb 20 13:32:16 2021 +0100 Merge branch 'master' into ecr_scan_on_push commit 3501d9a65d0f773b01cf2c1a50d13a7726bca166 Author: Roman Voitenko <roman.voitenko@konsult.atg.se> Date: Thu Oct 1 10:43:25 2020 +0200 add possibility to turn on/off image scanning not only during repo creation, but when repo already created commit d8b6b48fa34561c16680cc5787ab97b3f18b2141 Author: Roman Voitenko <roman.voitenko@konsult.atg.se> Date: Wed Sep 30 23:32:23 2020 +0200 add possibility to turn on ECR image scanning for repos created by ecr plugin	2021-10-22 14:34:35 +02:00
surtur	d2940d43e2	chore: bump docker to 20.10.7-dind Some checks failed continuous-integration/drone/push Build is failing Details	2021-06-08 22:32:45 +02:00
surtur	91965e06ed	chore: bump docker to 20.10.6-dind All checks were successful continuous-integration/drone/push Build is passing Details	2021-04-13 10:00:07 +02:00
surtur	9787e81f38	chore: bump docker to 20.10.5-dind All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-17 02:35:29 +01:00
surtur	48ca97aeb5	docker: add multiple different image tags All checks were successful continuous-integration/drone/push Build is passing Details rolling: * latest * edge-dind fixed to a commit: * ${DRONE_COMMIT_SHA:0:8} * ${DRONE_COMMIT_SHA:0:8}-edge-dind * ${DRONE_COMMIT_SHA:0:8}-linux-amd64	2021-03-17 02:23:38 +01:00
surtur	d532d1b620	ci: use plugins/docker:linux-amd64 * bump from :18 * add repo tag for dry_run	2021-03-17 02:22:36 +01:00
surtur	41993225d6	chore: bump docker to 19.03.15-dind	2021-03-17 02:15:37 +01:00
surtur	22d00cc6cb	ci: dry-run on push+publish to immawanderer All checks were successful continuous-integration/drone/push Build is passing Details	2021-03-17 00:49:30 +01:00
surtur	3bc2768d6f	jsonnet: thow out {arm,gcr,acr,heroku} stuff	2021-03-16 22:11:33 +01:00
surtur	1ba922ee04	ci: edit .drone.yml to only build for linux-amd64 * rm windows pipelines as I don't have any windows runners * rm arm/arm64 pipelines as I don't have any arm runners * rm {ecr,acr,whatever} publish steps as we're not publishing anything just yet * tag the image under immawanderer, not the official plugins repo * run as a dry_run (cause we're not really publishing, right?)	2021-03-16 22:11:33 +01:00