From 0159a918cd2ddfc2a93bde7f4170a50aef048d25 Mon Sep 17 00:00:00 2001 From: Archi Date: Thu, 20 May 2021 23:47:22 +0200 Subject: [PATCH] CI: Extract docker platforms to env variable --- .github/workflows/docker-ci.yml | 7 +++++-- .github/workflows/docker-publish-latest.yml | 5 +++-- .github/workflows/docker-publish-main.yml | 5 +++-- .github/workflows/docker-publish-released.yml | 5 +++-- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/docker-ci.yml b/.github/workflows/docker-ci.yml index 9a241217b..4bc954bdf 100644 --- a/.github/workflows/docker-ci.yml +++ b/.github/workflows/docker-ci.yml @@ -2,6 +2,9 @@ name: ASF-docker-ci on: [push, pull_request] +env: + PLATFORMS: linux/amd64,linux/arm,linux/arm64 + jobs: main: runs-on: ubuntu-latest @@ -19,11 +22,11 @@ jobs: uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: ${{ env.PLATFORMS }} - name: Build Docker image from Dockerfile.Service uses: docker/build-push-action@v2 with: context: . file: Dockerfile.Service - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: ${{ env.PLATFORMS }} diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml index faca106d3..7508f6b1f 100644 --- a/.github/workflows/docker-publish-latest.yml +++ b/.github/workflows/docker-publish-latest.yml @@ -5,6 +5,7 @@ on: types: [released] env: + PLATFORMS: linux/amd64,linux/arm,linux/arm64 TAG: latest jobs: @@ -43,12 +44,12 @@ jobs: echo "GHCR_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" echo "DH_REPOSITORY=$(echo ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" - - name: Build and push Docker image + - name: Build and publish Docker image from Dockerfile.Service uses: docker/build-push-action@v2 with: context: . file: Dockerfile.Service - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: ${{ env.PLATFORMS }} build-args: STEAM_TOKEN_DUMPER_TOKEN=${{ secrets.STEAM_TOKEN_DUMPER_TOKEN }} labels: | org.opencontainers.image.created=${{ env.DATE_ISO8601 }} diff --git a/.github/workflows/docker-publish-main.yml b/.github/workflows/docker-publish-main.yml index 0e57e6ea5..2d90a37b1 100644 --- a/.github/workflows/docker-publish-main.yml +++ b/.github/workflows/docker-publish-main.yml @@ -6,6 +6,7 @@ on: - main env: + PLATFORMS: linux/amd64,linux/arm,linux/arm64 TAG: main jobs: @@ -43,11 +44,11 @@ jobs: echo "GHCR_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" echo "DH_REPOSITORY=$(echo ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" - - name: Build and push Docker image + - name: Build and publish Docker image from Dockerfile uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: ${{ env.PLATFORMS }} build-args: STEAM_TOKEN_DUMPER_TOKEN=${{ secrets.STEAM_TOKEN_DUMPER_TOKEN }} labels: | org.opencontainers.image.created=${{ env.DATE_ISO8601 }} diff --git a/.github/workflows/docker-publish-released.yml b/.github/workflows/docker-publish-released.yml index 7e53987eb..291167ce6 100644 --- a/.github/workflows/docker-publish-released.yml +++ b/.github/workflows/docker-publish-released.yml @@ -6,6 +6,7 @@ on: - '*' env: + PLATFORMS: linux/amd64,linux/arm,linux/arm64 TAG: released jobs: @@ -44,11 +45,11 @@ jobs: echo "GHCR_REPOSITORY=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" echo "DH_REPOSITORY=$(echo ${{ secrets.DOCKERHUB_USERNAME }}/${{ github.event.repository.name }} | tr '[:upper:]' '[:lower:]')" >> "$GITHUB_ENV" - - name: Build and push Docker image + - name: Build and publish Docker image from Dockerfile uses: docker/build-push-action@v2 with: context: . - platforms: linux/amd64,linux/arm,linux/arm64 + platforms: ${{ env.PLATFORMS }} build-args: STEAM_TOKEN_DUMPER_TOKEN=${{ secrets.STEAM_TOKEN_DUMPER_TOKEN }} labels: | org.opencontainers.image.created=${{ env.DATE_ISO8601 }}