From 62c68d7982b49a6b839547617d3825981be5ab0b Mon Sep 17 00:00:00 2001 From: TP Honey Date: Fri, 6 Jan 2023 16:12:48 +0000 Subject: [PATCH 1/3] (maint) move to harness.drone.io --- .drone.jsonnet | 50 - .drone.yml | 1604 ++++++++--------- docker/acr/Dockerfile.windows.amd64.1809 | 10 - docker/acr/Dockerfile.windows.amd64.1909 | 10 - ...1803 => Dockerfile.windows.amd64.ltsc2022} | 2 +- docker/acr/manifest.tmpl | 22 +- docker/docker/Dockerfile.linux.arm | 15 - docker/docker/Dockerfile.windows.amd64.1803 | 26 - docker/docker/Dockerfile.windows.amd64.1909 | 28 - ...1903 => Dockerfile.windows.amd64.ltsc2022} | 4 +- docker/docker/manifest.tmpl | 24 - docker/ecr/Dockerfile.linux.arm | 4 - docker/ecr/Dockerfile.windows.amd64.1803 | 10 - docker/ecr/Dockerfile.windows.amd64.1909 | 2 +- docker/ecr/manifest.tmpl | 22 +- docker/gcr/Dockerfile.windows.amd64.1909 | 10 - ...1803 => Dockerfile.windows.amd64.ltsc2022} | 2 +- docker/gcr/manifest.tmpl | 16 +- docker/heroku/Dockerfile.linux.arm | 4 - docker/heroku/manifest.tmpl | 6 - pipeline.libsonnet | 206 --- 21 files changed, 788 insertions(+), 1289 deletions(-) delete mode 100644 .drone.jsonnet delete mode 100644 docker/acr/Dockerfile.windows.amd64.1809 delete mode 100644 docker/acr/Dockerfile.windows.amd64.1909 rename docker/acr/{Dockerfile.windows.amd64.1803 => Dockerfile.windows.amd64.ltsc2022} (87%) delete mode 100644 docker/docker/Dockerfile.linux.arm delete mode 100644 docker/docker/Dockerfile.windows.amd64.1803 delete mode 100644 docker/docker/Dockerfile.windows.amd64.1909 rename docker/docker/{Dockerfile.windows.amd64.1903 => Dockerfile.windows.amd64.ltsc2022} (91%) delete mode 100644 docker/ecr/Dockerfile.linux.arm delete mode 100644 docker/ecr/Dockerfile.windows.amd64.1803 delete mode 100644 docker/gcr/Dockerfile.windows.amd64.1909 rename docker/gcr/{Dockerfile.windows.amd64.1803 => Dockerfile.windows.amd64.ltsc2022} (87%) delete mode 100644 docker/heroku/Dockerfile.linux.arm delete mode 100644 pipeline.libsonnet diff --git a/.drone.jsonnet b/.drone.jsonnet deleted file mode 100644 index 99832f4e..00000000 --- a/.drone.jsonnet +++ /dev/null @@ -1,50 +0,0 @@ -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', - ]), -] diff --git a/.drone.yml b/.drone.yml index a0476b35..70a05e29 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,133 +1,109 @@ --- kind: pipeline name: testing +type: vm + +pool: + use: ubuntu platform: os: linux arch: amd64 steps: -- name: vet - image: golang:1.17.3 - commands: - - go vet ./... - environment: - GO111MODULE: on - volumes: - - name: gopath - path: /go - -- name: test - image: golang:1.17.3 - commands: - - go test -cover ./... - environment: - GO111MODULE: on - volumes: - - name: gopath - path: /go + - name: vet + image: golang:1.17.3 + commands: + - go vet ./... + environment: + GO111MODULE: on + volumes: + - name: gopath + path: /go + + - name: test + image: golang:1.17.3 + commands: + - go test -cover ./... + environment: + GO111MODULE: on + volumes: + - name: gopath + path: /go volumes: -- name: gopath - temp: {} + - name: gopath + temp: {} trigger: ref: - - refs/heads/master - - "refs/tags/**" - - "refs/pull/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" --- kind: pipeline -type: ssh +type: vm name: windows-1809-docker +pool: + use: windows + 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/docker/Dockerfile.windows.amd64.1809 + repo: plugins/docker + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-1809-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh +type: vm name: windows-1809-ecr +pool: + use: windows + 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/ecr/Dockerfile.windows.amd64.1809 + repo: plugins/docker + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-1809-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing @@ -135,50 +111,36 @@ depends_on: trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh +type: vm name: windows-1809-gcr +pool: + use: windows + 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/gcr/Dockerfile.windows.amd64.1809 + repo: plugins/gcr + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-1809-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing @@ -186,50 +148,36 @@ depends_on: trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh +type: vm name: windows-1809-acr +pool: + use: windows + 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/acr/Dockerfile.windows.amd64.1809 + repo: plugins/acr + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-1809-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing @@ -237,949 +185,951 @@ depends_on: trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh -name: windows-1909-docker +type: vm +name: windows-ltsc2022-docker + +pool: + use: windows-2022 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/docker/Dockerfile.windows.amd64.ltsc2022 + repo: plugins/docker + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-ltsc2022-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh -name: windows-1909-ecr +type: vm +name: windows-ltsc2022-ecr + +pool: + use: windows-2022 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/ecr/Dockerfile.windows.amd64.ltsc2022 + repo: plugins/ecr + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-ltsc2022-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh -name: windows-1909-gcr +type: vm +name: windows-ltsc2022-gcr + +pool: + use: windows-2022 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/gcr/Dockerfile.windows.amd64.ltsc2022 + repo: plugins/gcr + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-ltsc2022-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline -type: ssh -name: windows-1909-acr +type: vm +name: windows-ltsc2022-acr + +pool: + use: windows-2022 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 ] + - name: build + image: plugins/docker + settings: + dockerfile: docker/acr/Dockerfile.windows.amd64.ltsc2022 + repo: plugins/acr + username: + from_secret: docker_username + password: + from_secret: docker_password + auto_tag: true + auto_tag_suffix: windows-ltsc2022-amd64 + daemon_off: true + purge: false + when: + event: [push, tag] depends_on: - testing trigger: ref: - - refs/heads/master - - refs/tags/* + - refs/heads/master + - refs/tags/* --- kind: pipeline name: linux-amd64-docker +type: vm + +pool: + use: ubuntu 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-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/amd64/drone-docker ./cmd/drone-docker" - environment: - CGO_ENABLED: 0 - GO111MODULE: on - when: - event: - - tag - -- name: executable - image: golang:1.17.3 - commands: - - ./release/linux/amd64/drone-docker --help - -- 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 - username: - from_secret: docker_username - when: - event: - exclude: - - pull_request + - 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-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/amd64/drone-docker ./cmd/drone-docker' + environment: + CGO_ENABLED: 0 + GO111MODULE: on + when: + event: + - tag + + - name: executable + image: golang:1.17.3 + commands: + - ./release/linux/amd64/drone-docker --help + + - 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 + username: + from_secret: docker_username + when: + event: + exclude: + - pull_request trigger: ref: - - refs/heads/master - - "refs/tags/**" - - "refs/pull/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- testing + - testing --- kind: pipeline name: linux-arm64-docker +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- testing + - testing --- kind: pipeline name: notifications-docker +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" depends_on: -- windows-1809-docker -- windows-1909-docker -- linux-amd64-docker -- linux-arm64-docker + - windows-1809-docker + - windows-ltsc2022-docker + - linux-amd64-docker + - linux-arm64-docker --- kind: pipeline name: linux-amd64-gcr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-amd64-docker + - linux-amd64-docker --- kind: pipeline name: linux-arm64-gcr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-arm64-docker + - linux-arm64-docker --- kind: pipeline name: notifications-gcr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" depends_on: -- windows-1809-gcr -- windows-1909-gcr -- linux-amd64-gcr -- linux-arm64-gcr + - windows-1809-gcr + - windows-ltsc2022-gcr + - linux-amd64-gcr + - linux-arm64-gcr --- kind: pipeline name: linux-amd64-ecr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-amd64-docker + - linux-amd64-docker --- kind: pipeline name: linux-arm64-ecr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-arm64-docker + - linux-arm64-docker --- kind: pipeline name: notifications-ecr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" depends_on: -- windows-1809-ecr -- windows-1909-ecr -- linux-amd64-ecr -- linux-arm64-ecr + - windows-1809-ecr + - windows-ltsc2022-ecr + - linux-amd64-ecr + - linux-arm64-ecr --- kind: pipeline name: linux-amd64-heroku +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-amd64-docker + - linux-amd64-docker --- kind: pipeline name: linux-arm64-heroku +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-arm64-docker + - linux-arm64-docker --- kind: pipeline name: notifications-heroku +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" depends_on: -- linux-amd64-heroku -- linux-arm64-heroku + - linux-amd64-heroku + - linux-arm64-heroku --- kind: pipeline name: linux-amd64-acr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-amd64-docker + - linux-amd64-docker --- kind: pipeline name: linux-arm64-acr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" + - "refs/pull/**" depends_on: -- linux-arm64-docker + - linux-arm64-docker --- kind: pipeline name: notifications-acr +type: vm + +pool: + use: ubuntu 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 + - 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/**" + - refs/heads/master + - "refs/tags/**" depends_on: -- windows-1809-acr -- windows-1909-acr -- linux-amd64-acr -- linux-arm64-acr - -... + - windows-1809-acr + - windows-ltsc2022-acr + - linux-amd64-acr + - linux-arm64-acr diff --git a/docker/acr/Dockerfile.windows.amd64.1809 b/docker/acr/Dockerfile.windows.amd64.1809 deleted file mode 100644 index c03c17cf..00000000 --- a/docker/acr/Dockerfile.windows.amd64.1809 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1809-amd64 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone ACR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe -ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ] diff --git a/docker/acr/Dockerfile.windows.amd64.1909 b/docker/acr/Dockerfile.windows.amd64.1909 deleted file mode 100644 index 9b94ccd5..00000000 --- a/docker/acr/Dockerfile.windows.amd64.1909 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1909-amd64 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone ACR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe -ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ] diff --git a/docker/acr/Dockerfile.windows.amd64.1803 b/docker/acr/Dockerfile.windows.amd64.ltsc2022 similarity index 87% rename from docker/acr/Dockerfile.windows.amd64.1803 rename to docker/acr/Dockerfile.windows.amd64.ltsc2022 index 755fe9e6..60e3ff94 100644 --- a/docker/acr/Dockerfile.windows.amd64.1803 +++ b/docker/acr/Dockerfile.windows.amd64.ltsc2022 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1803-amd64 +FROM plugins/docker:windows-ltsc2022-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ACR" ` diff --git a/docker/acr/manifest.tmpl b/docker/acr/manifest.tmpl index c84e3c6a..d3bfb937 100644 --- a/docker/acr/manifest.tmpl +++ b/docker/acr/manifest.tmpl @@ -17,18 +17,6 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 - platform: - architecture: amd64 - os: windows - version: 1803 - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: @@ -36,14 +24,8 @@ manifests: os: windows version: 1809 - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 - platform: - architecture: amd64 - os: windows - version: 1903 - - - image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + image: plugins/acr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64 platform: architecture: amd64 os: windows - version: 1909 + version: ltsc2022 diff --git a/docker/docker/Dockerfile.linux.arm b/docker/docker/Dockerfile.linux.arm deleted file mode 100644 index 38c8992e..00000000 --- a/docker/docker/Dockerfile.linux.arm +++ /dev/null @@ -1,15 +0,0 @@ -FROM arm32v6/docker:19.03.8-dind - -ENV DOCKER_HOST=unix:///var/run/docker.sock - -RUN apk --update add --virtual .build-deps curl && \ - mkdir -p /etc/docker/ && \ - curl -SsL -o /etc/docker/default.json https://raw.githubusercontent.com/moby/moby/19.03/profiles/seccomp/default.json && \ - sed -i 's/SCMP_ACT_ERRNO/SCMP_ACT_TRACE/g' /etc/docker/default.json && \ - chmod 600 /etc/docker/default.json && \ - apk del .build-deps && \ - rm -rf /var/cache/apk/* && \ - rm -rf /tmp/* - -ADD release/linux/arm/drone-docker /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-docker"] diff --git a/docker/docker/Dockerfile.windows.amd64.1803 b/docker/docker/Dockerfile.windows.amd64.1803 deleted file mode 100644 index 41352d7a..00000000 --- a/docker/docker/Dockerfile.windows.amd64.1803 +++ /dev/null @@ -1,26 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1803 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 18.09.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.6-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM plugins/base:windows-1803 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/Dockerfile.windows.amd64.1909 b/docker/docker/Dockerfile.windows.amd64.1909 deleted file mode 100644 index e8dc3aea..00000000 --- a/docker/docker/Dockerfile.windows.amd64.1909 +++ /dev/null @@ -1,28 +0,0 @@ -# escape=` -FROM mcr.microsoft.com/windows/servercore:1909 as download - -SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] - -ENV DOCKER_VERSION 19.03.1 - -RUN Invoke-WebRequest 'http://constexpr.org/innoextract/files/innoextract-1.7-windows.zip' -OutFile 'innoextract.zip' -UseBasicParsing ; ` - Expand-Archive innoextract.zip -DestinationPath C:\ ; ` - Remove-Item -Path innoextract.zip - -RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 ; ` - Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing -RUN /innoextract.exe dockertoolbox.exe - -FROM mcr.microsoft.com/windows/nanoserver:1909 -USER ContainerAdministrator - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone Docker" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -RUN mkdir C:\bin -COPY --from=download /windows/system32/netapi32.dll /windows/system32/netapi32.dll -COPY --from=download /app/docker.exe C:/bin/docker.exe -ADD release/windows/amd64/drone-docker.exe C:/bin/drone-docker.exe -ENTRYPOINT [ "C:\\bin\\drone-docker.exe" ] diff --git a/docker/docker/Dockerfile.windows.amd64.1903 b/docker/docker/Dockerfile.windows.amd64.ltsc2022 similarity index 91% rename from docker/docker/Dockerfile.windows.amd64.1903 rename to docker/docker/Dockerfile.windows.amd64.ltsc2022 index a6eadef4..0274d0a2 100644 --- a/docker/docker/Dockerfile.windows.amd64.1903 +++ b/docker/docker/Dockerfile.windows.amd64.ltsc2022 @@ -1,5 +1,5 @@ # escape=` -FROM mcr.microsoft.com/windows/servercore:1903 as download +FROM mcr.microsoft.com/windows/servercore:ltsc2022 as download SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"] @@ -13,7 +13,7 @@ RUN [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tl Invoke-WebRequest $('https://github.com/docker/toolbox/releases/download/v{0}/DockerToolbox-{0}.exe' -f $env:DOCKER_VERSION) -OutFile 'dockertoolbox.exe' -UseBasicParsing RUN /innoextract.exe dockertoolbox.exe -FROM mcr.microsoft.com/windows/nanoserver:1903 +FROM mcr.microsoft.com/windows/nanoserver:ltsc2022 USER ContainerAdministrator LABEL maintainer="Drone.IO Community " ` diff --git a/docker/docker/manifest.tmpl b/docker/docker/manifest.tmpl index c9698659..ac65cafd 100644 --- a/docker/docker/manifest.tmpl +++ b/docker/docker/manifest.tmpl @@ -17,36 +17,12 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 - platform: - architecture: amd64 - os: windows - version: 1803 - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: architecture: amd64 os: windows version: 1809 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 - platform: - architecture: amd64 - os: windows - version: 1903 - - - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 - platform: - architecture: amd64 - os: windows - version: 1909 - image: plugins/docker:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64 platform: diff --git a/docker/ecr/Dockerfile.linux.arm b/docker/ecr/Dockerfile.linux.arm deleted file mode 100644 index f8dd9e39..00000000 --- a/docker/ecr/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-ecr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-ecr"] diff --git a/docker/ecr/Dockerfile.windows.amd64.1803 b/docker/ecr/Dockerfile.windows.amd64.1803 deleted file mode 100644 index c1bbd532..00000000 --- a/docker/ecr/Dockerfile.windows.amd64.1803 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1803-amd64 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone ECR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-ecr.exe C:/bin/drone-ecr.exe -ENTRYPOINT [ "C:\\bin\\drone-ecr.exe" ] diff --git a/docker/ecr/Dockerfile.windows.amd64.1909 b/docker/ecr/Dockerfile.windows.amd64.1909 index ae6e96f4..40bbbbb5 100644 --- a/docker/ecr/Dockerfile.windows.amd64.1909 +++ b/docker/ecr/Dockerfile.windows.amd64.1909 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1909-amd64 +FROM plugins/docker:windows-ltsc2022-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone ECR" ` diff --git a/docker/ecr/manifest.tmpl b/docker/ecr/manifest.tmpl index 36bde043..a97f75d1 100644 --- a/docker/ecr/manifest.tmpl +++ b/docker/ecr/manifest.tmpl @@ -17,18 +17,6 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 - platform: - architecture: amd64 - os: windows - version: 1803 - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: @@ -36,14 +24,8 @@ manifests: os: windows version: 1809 - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1903-amd64 - platform: - architecture: amd64 - os: windows - version: 1903 - - - image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + image: plugins/ecr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64 platform: architecture: amd64 os: windows - version: 1909 + version: ltsc2022 diff --git a/docker/gcr/Dockerfile.windows.amd64.1909 b/docker/gcr/Dockerfile.windows.amd64.1909 deleted file mode 100644 index faf22742..00000000 --- a/docker/gcr/Dockerfile.windows.amd64.1909 +++ /dev/null @@ -1,10 +0,0 @@ -# escape=` -FROM plugins/docker:windows-1909-amd64 - -LABEL maintainer="Drone.IO Community " ` - org.label-schema.name="Drone GCR" ` - org.label-schema.vendor="Drone.IO Community" ` - org.label-schema.schema-version="1.0" - -ADD release/windows/amd64/drone-gcr.exe C:/bin/drone-gcr.exe -ENTRYPOINT [ "C:\\bin\\drone-gcr.exe" ] diff --git a/docker/gcr/Dockerfile.windows.amd64.1803 b/docker/gcr/Dockerfile.windows.amd64.ltsc2022 similarity index 87% rename from docker/gcr/Dockerfile.windows.amd64.1803 rename to docker/gcr/Dockerfile.windows.amd64.ltsc2022 index fc03bb4f..baf39c43 100644 --- a/docker/gcr/Dockerfile.windows.amd64.1803 +++ b/docker/gcr/Dockerfile.windows.amd64.ltsc2022 @@ -1,5 +1,5 @@ # escape=` -FROM plugins/docker:windows-1803-amd64 +FROM plugins/docker:windows-ltsc2022-amd64 LABEL maintainer="Drone.IO Community " ` org.label-schema.name="Drone GCR" ` diff --git a/docker/gcr/manifest.tmpl b/docker/gcr/manifest.tmpl index 1c83f07e..c2a60c80 100644 --- a/docker/gcr/manifest.tmpl +++ b/docker/gcr/manifest.tmpl @@ -17,18 +17,6 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 - - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1803-amd64 - platform: - architecture: amd64 - os: windows - version: 1803 - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1809-amd64 platform: @@ -36,8 +24,8 @@ manifests: os: windows version: 1809 - - image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-1909-amd64 + image: plugins/gcr:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}windows-ltsc2022-amd64 platform: architecture: amd64 os: windows - version: 1909 + version: ltsc2022 diff --git a/docker/heroku/Dockerfile.linux.arm b/docker/heroku/Dockerfile.linux.arm deleted file mode 100644 index b233cca6..00000000 --- a/docker/heroku/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-heroku /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-heroku"] diff --git a/docker/heroku/manifest.tmpl b/docker/heroku/manifest.tmpl index 28ed9a55..2c8edfda 100644 --- a/docker/heroku/manifest.tmpl +++ b/docker/heroku/manifest.tmpl @@ -17,9 +17,3 @@ manifests: architecture: arm64 os: linux variant: v8 - - - image: plugins/heroku:{{#if build.tag}}{{trimPrefix "v" build.tag}}-{{/if}}linux-arm - platform: - architecture: arm - os: linux - variant: v7 diff --git a/pipeline.libsonnet b/pipeline.libsonnet deleted file mode 100644 index 08f102fa..00000000 --- a/pipeline.libsonnet +++ /dev/null @@ -1,206 +0,0 @@ -local windows_pipe = '\\\\\\\\.\\\\pipe\\\\docker_engine'; -local windows_pipe_volume = 'docker_pipe'; -local test_pipeline_name = 'testing'; - -local windows(os) = os == 'windows'; - -local golang_image(os, version) = - 'golang:' + '1.13' + if windows(os) then '-windowsservercore-' + version else ''; - -{ - test(os='linux', arch='amd64', version=''):: - local is_windows = windows(os); - local golang = golang_image(os, version); - local volumes = if is_windows then [{name: 'gopath', path: 'C:\\\\gopath'}] else [{name: 'gopath', path: '/go',}]; - { - kind: 'pipeline', - name: test_pipeline_name, - platform: { - os: os, - arch: arch, - version: if std.length(version) > 0 then version, - }, - steps: [ - { - name: 'vet', - image: golang, - pull: 'always', - environment: { - GO111MODULE: 'on', - }, - commands: [ - 'go vet ./...', - ], - volumes: volumes, - }, - { - name: 'test', - image: golang, - pull: 'always', - environment: { - GO111MODULE: 'on', - }, - commands: [ - 'go test -cover ./...', - ], - volumes: volumes, - }, - ], - trigger: { - ref: [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - volumes: [{name: 'gopath', temp: {}}] - }, - - build(name, os='linux', arch='amd64', version=''):: - local is_windows = windows(os); - local tag = if is_windows then os + '-' + version else os + '-' + arch; - local file_suffix = std.strReplace(tag, '-', '.'); - local volumes = if is_windows then [{ name: windows_pipe_volume, path: windows_pipe }] else []; - local golang = golang_image(os, version); - local plugin_repo = 'plugins/' + name; - local extension = if is_windows then '.exe' else ''; - local depends_on = if name == 'docker' then [test_pipeline_name] else [tag + '-docker']; - { - kind: 'pipeline', - name: tag + '-' + name, - platform: { - os: os, - arch: arch, - version: if std.length(version) > 0 then version, - }, - steps: [ - { - name: 'build-push', - image: golang, - pull: 'always', - environment: { - CGO_ENABLED: '0', - GO111MODULE: 'on', - }, - commands: [ - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/' + os + '/' + arch + '/drone-' + name + extension + ' ./cmd/drone-' + name, - ], - when: { - event: { - exclude: ['tag'], - }, - }, - }, - { - name: 'build-tag', - image: golang, - pull: 'always', - environment: { - CGO_ENABLED: '0', - GO111MODULE: 'on', - }, - commands: [ - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/' + os + '/' + arch + '/drone-' + name + extension + ' ./cmd/drone-' + name, - ], - when: { - event: ['tag'], - }, - }, - if name == "docker" then { - name: 'executable', - image: golang, - pull: 'always', - commands: [ - './release/' + os + '/' + arch + '/drone-' + name + extension + ' --help', - ], - }, - { - name: 'dryrun', - image: 'plugins/docker:' + tag, - pull: 'always', - settings: { - dry_run: true, - tags: tag, - dockerfile: 'docker/'+ name +'/Dockerfile.' + file_suffix, - daemon_off: if is_windows then 'true' else 'false', - repo: plugin_repo, - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - }, - volumes: if std.length(volumes) > 0 then volumes, - when: { - event: ['pull_request'], - }, - }, - { - name: 'publish', - image: 'plugins/docker:' + tag, - pull: 'always', - settings: { - auto_tag: true, - auto_tag_suffix: tag, - daemon_off: if is_windows then 'true' else 'false', - dockerfile: 'docker/' + name + '/Dockerfile.' + file_suffix, - repo: plugin_repo, - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - }, - volumes: if std.length(volumes) > 0 then volumes, - when: { - event: { - exclude: ['pull_request'], - }, - }, - }, - ], - trigger: { - ref: [ - 'refs/heads/master', - 'refs/tags/**', - 'refs/pull/**', - ], - }, - depends_on: depends_on, - volumes: if is_windows then [{ name: windows_pipe_volume, host: { path: windows_pipe } }], - }, - - notifications(name, os='linux', arch='amd64', version='', depends_on=[]):: - { - kind: 'pipeline', - name: 'notifications-' + name, - platform: { - os: os, - arch: arch, - version: if std.length(version) > 0 then version, - }, - steps: [ - { - name: 'manifest', - image: 'plugins/manifest', - pull: 'always', - settings: { - username: { from_secret: 'docker_username' }, - password: { from_secret: 'docker_password' }, - spec: 'docker/' + name + '/manifest.tmpl', - ignore_missing: true, - auto_tag: true, - }, - }, - { - name: 'microbadger', - image: 'plugins/webhook', - pull: 'always', - settings: { - urls: { from_secret: 'microbadger_' + name }, - }, - }, - ], - depends_on: [x + '-' + name for x in depends_on], - trigger: { - ref: [ - 'refs/heads/master', - 'refs/tags/**', - ], - }, - }, -} From a2a166932d15e324787a15eecdb15c8ab7425779 Mon Sep 17 00:00:00 2001 From: TP Honey Date: Mon, 9 Jan 2023 14:32:14 +0000 Subject: [PATCH 2/3] (test) test with tphoney docker user --- .drone.yml | 252 +++++++++--------- docker/acr/Dockerfile.linux.arm | 4 - docker/acr/Dockerfile.windows.amd64.1809 | 10 + ...1909 => Dockerfile.windows.amd64.ltsc2022} | 0 docker/gcr/Dockerfile.linux.arm | 4 - 5 files changed, 141 insertions(+), 129 deletions(-) delete mode 100644 docker/acr/Dockerfile.linux.arm create mode 100644 docker/acr/Dockerfile.windows.amd64.1809 rename docker/ecr/{Dockerfile.windows.amd64.1909 => Dockerfile.windows.amd64.ltsc2022} (100%) delete mode 100644 docker/gcr/Dockerfile.linux.arm diff --git a/.drone.yml b/.drone.yml index 70a05e29..a93b07d1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -12,21 +12,21 @@ platform: steps: - name: vet - image: golang:1.17.3 + image: golang:1.17 commands: - go vet ./... environment: - GO111MODULE: on + volumes: - name: gopath path: /go - name: test - image: golang:1.17.3 + image: golang:1.17 commands: - go test -cover ./... environment: - GO111MODULE: on + volumes: - name: gopath path: /go @@ -51,20 +51,27 @@ pool: platform: os: windows + arch: amd64 steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker - name: build image: plugins/docker settings: dockerfile: docker/docker/Dockerfile.windows.amd64.1809 - repo: plugins/docker + repo: tphoney/docker username: from_secret: docker_username password: from_secret: docker_password auto_tag: true - auto_tag_suffix: windows-1809-amd64 daemon_off: true + auto_tag_suffix: windows-1809-amd64 purge: false when: event: [push, tag] @@ -89,24 +96,28 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr - name: build image: plugins/docker settings: dockerfile: docker/ecr/Dockerfile.windows.amd64.1809 - repo: plugins/docker + repo: tphoney/docker username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-1809-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing - windows-1809-docker trigger: @@ -126,25 +137,29 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr - name: build image: plugins/docker settings: dockerfile: docker/gcr/Dockerfile.windows.amd64.1809 - repo: plugins/gcr + repo: tphoney/gcr username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-1809-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing - - windows-1809-ecr + - windows-1809-docker trigger: ref: @@ -163,25 +178,29 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr - name: build image: plugins/docker settings: dockerfile: docker/acr/Dockerfile.windows.amd64.1809 - repo: plugins/acr + repo: tphoney/acr username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-1809-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing - - windows-1809-gcr + - windows-1809-docker trigger: ref: @@ -200,18 +219,23 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker - name: build image: plugins/docker settings: dockerfile: docker/docker/Dockerfile.windows.amd64.ltsc2022 - repo: plugins/docker + repo: tphoney/docker username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-ltsc2022-amd64 - daemon_off: true purge: false when: event: [push, tag] @@ -236,24 +260,29 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr - name: build image: plugins/docker settings: dockerfile: docker/ecr/Dockerfile.windows.amd64.ltsc2022 - repo: plugins/ecr + repo: tphoney/ecr username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-ltsc2022-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing + - windows-ltsc2022-docker trigger: ref: @@ -272,24 +301,29 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr - name: build image: plugins/docker settings: dockerfile: docker/gcr/Dockerfile.windows.amd64.ltsc2022 - repo: plugins/gcr + repo: tphoney/gcr username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-ltsc2022-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing + - windows-ltsc2022-docker trigger: ref: @@ -308,24 +342,29 @@ platform: os: windows steps: + - name: go build + image: golang:1.17 + environment: + CGO_ENABLED: 0 + commands: + - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr - name: build image: plugins/docker settings: dockerfile: docker/acr/Dockerfile.windows.amd64.ltsc2022 - repo: plugins/acr + repo: tphoney/acr username: from_secret: docker_username password: from_secret: docker_password auto_tag: true auto_tag_suffix: windows-ltsc2022-amd64 - daemon_off: true purge: false when: event: [push, tag] depends_on: - - testing + - windows-ltsc2022-docker trigger: ref: @@ -346,30 +385,28 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 commands: - 'go build -v -ldflags "-X main.version=${DRONE_COMMIT_SHA:0:8}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker' environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: exclude: - tag - name: build-tag - image: golang:1.17.3 + image: golang:1.17 commands: - 'go build -v -ldflags "-X main.version=${DRONE_TAG##v}" -a -tags netgo -o release/linux/amd64/drone-docker ./cmd/drone-docker' environment: CGO_ENABLED: 0 - GO111MODULE: on when: event: - tag - name: executable - image: golang:1.17.3 + image: golang:1.17 commands: - ./release/linux/amd64/drone-docker --help @@ -382,7 +419,7 @@ steps: dockerfile: docker/docker/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: plugins/docker + repo: tphoney/docker username: from_secret: docker_username when: @@ -413,30 +450,28 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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 + image: golang:1.17 commands: - ./release/linux/arm64/drone-docker --help @@ -449,7 +484,7 @@ steps: dockerfile: docker/docker/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: plugins/docker + repo: tphoney/docker username: from_secret: docker_username when: @@ -515,24 +550,22 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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 @@ -546,7 +579,7 @@ steps: dockerfile: docker/gcr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: plugins/gcr + repo: tphoney/gcr username: from_secret: docker_username when: @@ -577,24 +610,22 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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 @@ -608,7 +639,7 @@ steps: dockerfile: docker/gcr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: plugins/gcr + repo: tphoney/gcr username: from_secret: docker_username when: @@ -674,28 +705,24 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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: @@ -705,7 +732,7 @@ steps: dockerfile: docker/ecr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: plugins/ecr + repo: tphoney/ecr username: from_secret: docker_username when: @@ -736,28 +763,24 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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: @@ -767,7 +790,7 @@ steps: dockerfile: docker/ecr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: plugins/ecr + repo: tphoney/ecr username: from_secret: docker_username when: @@ -833,24 +856,21 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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 @@ -864,7 +884,7 @@ steps: dockerfile: docker/heroku/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: plugins/heroku + repo: tphoney/heroku username: from_secret: docker_username when: @@ -895,28 +915,24 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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: @@ -926,7 +942,7 @@ steps: dockerfile: docker/heroku/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: plugins/heroku + repo: tphoney/heroku username: from_secret: docker_username when: @@ -943,38 +959,38 @@ trigger: depends_on: - linux-arm64-docker ---- -kind: pipeline -name: notifications-heroku -type: vm - -pool: - use: ubuntu - -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 +# --- +# kind: pipeline +# name: notifications-heroku +# type: vm + +# pool: +# use: ubuntu + +# 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 --- kind: pipeline @@ -990,28 +1006,24 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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: @@ -1021,7 +1033,7 @@ steps: dockerfile: docker/acr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: plugins/acr + repo: tphoney/acr username: from_secret: docker_username when: @@ -1052,24 +1064,22 @@ platform: steps: - name: build-push - image: golang:1.17.3 + image: golang:1.17 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 + image: golang:1.17 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 @@ -1083,7 +1093,7 @@ steps: dockerfile: docker/acr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: plugins/acr + repo: tphoney/acr username: from_secret: docker_username when: diff --git a/docker/acr/Dockerfile.linux.arm b/docker/acr/Dockerfile.linux.arm deleted file mode 100644 index c9898572..00000000 --- a/docker/acr/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-acr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-acr"] diff --git a/docker/acr/Dockerfile.windows.amd64.1809 b/docker/acr/Dockerfile.windows.amd64.1809 new file mode 100644 index 00000000..c03c17cf --- /dev/null +++ b/docker/acr/Dockerfile.windows.amd64.1809 @@ -0,0 +1,10 @@ +# escape=` +FROM plugins/docker:windows-1809-amd64 + +LABEL maintainer="Drone.IO Community " ` + org.label-schema.name="Drone ACR" ` + org.label-schema.vendor="Drone.IO Community" ` + org.label-schema.schema-version="1.0" + +ADD release/windows/amd64/drone-acr.exe C:/bin/drone-acr.exe +ENTRYPOINT [ "C:\\bin\\drone-acr.exe" ] diff --git a/docker/ecr/Dockerfile.windows.amd64.1909 b/docker/ecr/Dockerfile.windows.amd64.ltsc2022 similarity index 100% rename from docker/ecr/Dockerfile.windows.amd64.1909 rename to docker/ecr/Dockerfile.windows.amd64.ltsc2022 diff --git a/docker/gcr/Dockerfile.linux.arm b/docker/gcr/Dockerfile.linux.arm deleted file mode 100644 index 718ce0f1..00000000 --- a/docker/gcr/Dockerfile.linux.arm +++ /dev/null @@ -1,4 +0,0 @@ -FROM plugins/docker:linux-arm - -ADD release/linux/arm/drone-gcr /bin/ -ENTRYPOINT ["/usr/local/bin/dockerd-entrypoint.sh", "/bin/drone-gcr"] From 192db62a3aa9629bc6f05bf298e814e149c01082 Mon Sep 17 00:00:00 2001 From: TP Honey Date: Tue, 10 Jan 2023 16:05:24 +0000 Subject: [PATCH 3/3] simplify windows builds --- .drone.yml | 320 ++++++++++++++--------------------------------------- 1 file changed, 83 insertions(+), 237 deletions(-) diff --git a/.drone.yml b/.drone.yml index a93b07d1..94ce3f84 100644 --- a/.drone.yml +++ b/.drone.yml @@ -44,7 +44,7 @@ trigger: --- kind: pipeline type: vm -name: windows-1809-docker +name: windows-1809 pool: use: windows @@ -60,11 +60,14 @@ steps: CGO_ENABLED: 0 commands: - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker - - name: build + - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr + - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr + - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr + - name: build docker plugin image: plugins/docker settings: dockerfile: docker/docker/Dockerfile.windows.amd64.1809 - repo: tphoney/docker + repo: plugins/docker username: from_secret: docker_username password: @@ -75,38 +78,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - testing - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-1809-ecr - -pool: - use: windows - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr - - name: build + - name: build ecr plugin image: plugins/docker settings: dockerfile: docker/ecr/Dockerfile.windows.amd64.1809 - repo: tphoney/docker + repo: plugins/docker username: from_secret: docker_username password: @@ -116,38 +92,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - windows-1809-docker - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-1809-gcr - -pool: - use: windows - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr - - name: build + - name: build gcr plugin image: plugins/docker settings: dockerfile: docker/gcr/Dockerfile.windows.amd64.1809 - repo: tphoney/gcr + repo: plugins/gcr username: from_secret: docker_username password: @@ -157,38 +106,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - windows-1809-docker - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-1809-acr - -pool: - use: windows - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr - - name: build + - name: build acr plugin image: plugins/docker settings: dockerfile: docker/acr/Dockerfile.windows.amd64.1809 - repo: tphoney/acr + repo: plugins/acr username: from_secret: docker_username password: @@ -200,17 +122,18 @@ steps: event: [push, tag] depends_on: - - windows-1809-docker + - testing trigger: ref: - refs/heads/master - refs/tags/* + - "refs/pull/**" --- kind: pipeline type: vm -name: windows-ltsc2022-docker +name: windows-ltsc2022 pool: use: windows-2022 @@ -225,11 +148,14 @@ steps: CGO_ENABLED: 0 commands: - go build -o release/windows/amd64/drone-docker.exe ./cmd/drone-docker - - name: build + - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr + - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr + - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr + - name: build docker plugin image: plugins/docker settings: dockerfile: docker/docker/Dockerfile.windows.amd64.ltsc2022 - repo: tphoney/docker + repo: plugins/docker username: from_secret: docker_username password: @@ -239,38 +165,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - testing - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-ltsc2022-ecr - -pool: - use: windows-2022 - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-ecr.exe ./cmd/drone-ecr - - name: build + - name: build ecr plugin image: plugins/docker settings: dockerfile: docker/ecr/Dockerfile.windows.amd64.ltsc2022 - repo: tphoney/ecr + repo: plugins/ecr username: from_secret: docker_username password: @@ -280,38 +179,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - windows-ltsc2022-docker - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-ltsc2022-gcr - -pool: - use: windows-2022 - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-gcr.exe ./cmd/drone-gcr - - name: build + - name: build gcr plugin image: plugins/docker settings: dockerfile: docker/gcr/Dockerfile.windows.amd64.ltsc2022 - repo: tphoney/gcr + repo: plugins/gcr username: from_secret: docker_username password: @@ -321,38 +193,11 @@ steps: purge: false when: event: [push, tag] - -depends_on: - - windows-ltsc2022-docker - -trigger: - ref: - - refs/heads/master - - refs/tags/* - ---- -kind: pipeline -type: vm -name: windows-ltsc2022-acr - -pool: - use: windows-2022 - -platform: - os: windows - -steps: - - name: go build - image: golang:1.17 - environment: - CGO_ENABLED: 0 - commands: - - go build -o release/windows/amd64/drone-acr.exe ./cmd/drone-acr - - name: build + - name: build acr plugin image: plugins/docker settings: dockerfile: docker/acr/Dockerfile.windows.amd64.ltsc2022 - repo: tphoney/acr + repo: plugins/acr username: from_secret: docker_username password: @@ -364,12 +209,13 @@ steps: event: [push, tag] depends_on: - - windows-ltsc2022-docker + - testing trigger: ref: - refs/heads/master - refs/tags/* + - "refs/pull/**" --- kind: pipeline @@ -419,7 +265,7 @@ steps: dockerfile: docker/docker/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: tphoney/docker + repo: plugins/docker username: from_secret: docker_username when: @@ -442,7 +288,7 @@ name: linux-arm64-docker type: vm pool: - use: ubuntu + use: ubuntu_arm64 platform: os: linux @@ -484,7 +330,7 @@ steps: dockerfile: docker/docker/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: tphoney/docker + repo: plugins/docker username: from_secret: docker_username when: @@ -531,8 +377,8 @@ trigger: - "refs/tags/**" depends_on: - - windows-1809-docker - - windows-ltsc2022-docker + - windows-1809 + - windows-ltsc2022 - linux-amd64-docker - linux-arm64-docker @@ -579,7 +425,7 @@ steps: dockerfile: docker/gcr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: tphoney/gcr + repo: plugins/gcr username: from_secret: docker_username when: @@ -602,7 +448,7 @@ name: linux-arm64-gcr type: vm pool: - use: ubuntu + use: ubuntu_arm64 platform: os: linux @@ -639,7 +485,7 @@ steps: dockerfile: docker/gcr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: tphoney/gcr + repo: plugins/gcr username: from_secret: docker_username when: @@ -686,8 +532,8 @@ trigger: - "refs/tags/**" depends_on: - - windows-1809-gcr - - windows-ltsc2022-gcr + - windows-1809 + - windows-ltsc2022 - linux-amd64-gcr - linux-arm64-gcr @@ -732,7 +578,7 @@ steps: dockerfile: docker/ecr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: tphoney/ecr + repo: plugins/ecr username: from_secret: docker_username when: @@ -755,7 +601,7 @@ name: linux-arm64-ecr type: vm pool: - use: ubuntu + use: ubuntu_arm64 platform: os: linux @@ -790,7 +636,7 @@ steps: dockerfile: docker/ecr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: tphoney/ecr + repo: plugins/ecr username: from_secret: docker_username when: @@ -837,8 +683,8 @@ trigger: - "refs/tags/**" depends_on: - - windows-1809-ecr - - windows-ltsc2022-ecr + - windows-1809 + - windows-ltsc2022 - linux-amd64-ecr - linux-arm64-ecr @@ -884,7 +730,7 @@ steps: dockerfile: docker/heroku/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: tphoney/heroku + repo: plugins/heroku username: from_secret: docker_username when: @@ -907,7 +753,7 @@ name: linux-arm64-heroku type: vm pool: - use: ubuntu + use: ubuntu_arm64 platform: os: linux @@ -942,7 +788,7 @@ steps: dockerfile: docker/heroku/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: tphoney/heroku + repo: plugins/heroku username: from_secret: docker_username when: @@ -959,38 +805,38 @@ trigger: depends_on: - linux-arm64-docker -# --- -# kind: pipeline -# name: notifications-heroku -# type: vm - -# pool: -# use: ubuntu - -# 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 +--- +kind: pipeline +name: notifications-heroku +type: vm + +pool: + use: ubuntu + +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 --- kind: pipeline @@ -1033,7 +879,7 @@ steps: dockerfile: docker/acr/Dockerfile.linux.amd64 password: from_secret: docker_password - repo: tphoney/acr + repo: plugins/acr username: from_secret: docker_username when: @@ -1056,7 +902,7 @@ name: linux-arm64-acr type: vm pool: - use: ubuntu + use: ubuntu_arm64 platform: os: linux @@ -1093,7 +939,7 @@ steps: dockerfile: docker/acr/Dockerfile.linux.arm64 password: from_secret: docker_password - repo: tphoney/acr + repo: plugins/acr username: from_secret: docker_username when: @@ -1139,7 +985,7 @@ trigger: - "refs/tags/**" depends_on: - - windows-1809-acr - - windows-ltsc2022-acr + - windows-1809 + - windows-ltsc2022 - linux-amd64-acr - linux-arm64-acr