diff --git a/.github/workflows/release-tests.yaml b/.github/workflows/release-tests.yaml index f9288c0f..5e96abd0 100644 --- a/.github/workflows/release-tests.yaml +++ b/.github/workflows/release-tests.yaml @@ -23,6 +23,10 @@ jobs: uses: actions/checkout@v1 with: path: ./src/github.com/${{ github.repository }} + - name: Set up QEMU + uses: docker/setup-qemu-action@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 - name: GoReleaser Action uses: goreleaser/goreleaser-action@v6 with: diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 29fd84c9..ffb16e3c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -33,6 +33,10 @@ jobs: fetch-depth: 0 - name: Update alpine image run: docker pull alpine + - name: Set up QEMU + uses: docker/setup-qemu-action@v4 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v4 - name: Install Doppler CLI uses: dopplerhq/cli-action@v2 - name: Install Cloudsmith CLI diff --git a/.goreleaser.yml b/.goreleaser.yml index bd530528..b795c50b 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -105,26 +105,26 @@ changelog: - Merge pull request - Merge branch -dockers: +dockers_v2: - dockerfile: docker/alpine - goos: linux - goarch: amd64 ids: - doppler - image_templates: - - "dopplerhq/cli:{{ .Version }}" # Ex: 1.4.2 - - "dopplerhq/cli:{{ .Major }}.{{ .Minor }}" # Ex: 1.4 - - "dopplerhq/cli:{{ .Major }}" # Ex: 1 - - "dopplerhq/cli:latest" - - "gcr.io/dopplerhq/cli:{{ .Version }}" # Ex: 1.4.2 - - "gcr.io/dopplerhq/cli:{{ .Major }}.{{ .Minor }}" # Ex: 1.4 - - "gcr.io/dopplerhq/cli:{{ .Major }}" # Ex: 1 - - "gcr.io/dopplerhq/cli:latest" - build_flag_templates: - - "--label=org.label-schema.schema-version=1.0" - - "--label=org.label-schema.version={{.Version}}" - - "--label=org.label-schema.name={{.ProjectName}}" - - "--platform=linux/amd64" + images: + - "dopplerhq/cli" + - "gcr.io/dopplerhq/cli" + tags: + - "{{ .Version }}" # Ex: 1.4.2 + - "{{ .Major }}.{{ .Minor }}" # Ex: 1.4 + - "{{ .Major }}" # Ex: 1 + - "latest" + platforms: + - "linux/amd64" + - "linux/arm64" + sbom: false + labels: + org.label-schema.schema-version: "1.0" + org.label-schema.version: "{{ .Version }}" + org.label-schema.name: "{{ .ProjectName }}" brews: - name: doppler diff --git a/docker/alpine b/docker/alpine index f75c71a5..a447ee83 100644 --- a/docker/alpine +++ b/docker/alpine @@ -4,5 +4,6 @@ RUN apk add --no-cache tini # Update OpenSSL to address CVE because `alpine` isn't updated yet RUN apk update && apk upgrade --no-cache libcrypto3 libssl3 -COPY doppler /bin/doppler +ARG TARGETPLATFORM +COPY $TARGETPLATFORM/doppler /bin/doppler ENTRYPOINT ["/sbin/tini", "--", "/bin/doppler"]