From 8eabc152cee61ba0a3063f9f46dccbc785d24dbd Mon Sep 17 00:00:00 2001 From: bgauduch Date: Sat, 2 Mar 2024 09:31:48 +0100 Subject: [PATCH 1/4] testing image push to gcr.io --- .github/workflows/push-latest.yml | 51 ++++++++++++++++++++++--------- 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml index 4daae5e..9607ee2 100644 --- a/.github/workflows/push-latest.yml +++ b/.github/workflows/push-latest.yml @@ -3,6 +3,7 @@ name: push-latest # trigger on push to master # only on Dockerfile related modifications on: + workflow_dispatch: push: branches: - "master" @@ -15,9 +16,8 @@ on: - ".github/workflows/push-latest.yml" env: - ORGANIZATION: "zenika" - IMAGE_NAME: "terraform-azure-cli" - IMAGE_TAG: "latest" + IMAGE_NAME: "zenika/terraform-azure-cli" + REGISTRY: ghcr.io jobs: build_push_latest: @@ -32,20 +32,41 @@ jobs: echo "AZ_VERSION=$(jq -r '.azcli_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV echo "TF_VERSION=$(jq -r '.tf_version | sort | .[-1]' supported_versions.json)" >> $GITHUB_ENV - - name: Build image - run: docker image build . --file Dockerfile --build-arg TERRAFORM_VERSION=${TF_VERSION} --build-arg AZURE_CLI_VERSION=${AZ_VERSION} --tag $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG + - name: Log in to the Container registry + uses: docker/login-action@v3 + with: + registry: ${{ env.REGISTRY }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - - name: Login to Docker Hub registry - run: echo '${{ secrets.DOCKERHUB_PASS }}' | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} + flavor: | + latest=auto + tags: | + # set latest tag for default branch + type=raw,value=latest,enable={{is_default_branch}} - - name: Push image to registry - run: docker push $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 - - name: Save image - run: docker image save -o $IMAGE_NAME-$IMAGE_TAG.tar $ORGANIZATION/$IMAGE_NAME:$IMAGE_TAG + - name: Set up Buildx + id: buildx + uses: docker/setup-buildx-action@v2 - - name: Upload image artifact - uses: actions/upload-artifact@v4 + - name: Build and push container images + uses: docker/build-push-action@v4 with: - name: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }} - path: ${{ env.IMAGE_NAME }}-${{ env.IMAGE_TAG }}.tar + context: . + platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 + build-args: | + TERRAFORM_VERSION=${{ env.TF_VERSION }} + AWS_CLI_VERSION=${{ env.AWS_VERSION }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + push: true + cache-from: type=gha + cache-to: type=gha,mode=max From fe2ed2bc02e401301badf72824bbfee3b993ae74 Mon Sep 17 00:00:00 2001 From: bgauduch Date: Sat, 2 Mar 2024 09:35:36 +0100 Subject: [PATCH 2/4] update workflow triggers --- .github/workflows/push-latest.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml index 9607ee2..002b1d9 100644 --- a/.github/workflows/push-latest.yml +++ b/.github/workflows/push-latest.yml @@ -1,9 +1,14 @@ name: push-latest -# trigger on push to master -# only on Dockerfile related modifications +# + on: + # Allow manual trigger on default branch workflow_dispatch: + # Trigger selected on PR events + pull_request: + types: [synchronize, opened, reopened, ready_for_review] + # Trigger on push to master only on Dockerfile related modifications push: branches: - "master" From ab15af5bbe5397490a2f743d3b8ffeb4b6020532 Mon Sep 17 00:00:00 2001 From: bgauduch Date: Sat, 2 Mar 2024 09:49:22 +0100 Subject: [PATCH 3/4] remove raw tag on master only --- .github/workflows/push-latest.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml index 002b1d9..ba7ebcd 100644 --- a/.github/workflows/push-latest.yml +++ b/.github/workflows/push-latest.yml @@ -5,7 +5,7 @@ name: push-latest on: # Allow manual trigger on default branch workflow_dispatch: - # Trigger selected on PR events + # DELETE ME TEST ONLY Trigger selected on PR events pull_request: types: [synchronize, opened, reopened, ready_for_review] # Trigger on push to master only on Dockerfile related modifications @@ -51,9 +51,6 @@ jobs: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} flavor: | latest=auto - tags: | - # set latest tag for default branch - type=raw,value=latest,enable={{is_default_branch}} - name: Set up QEMU uses: docker/setup-qemu-action@v2 From a5b8ff35922a4a1e3e17662895f0f796092c76f7 Mon Sep 17 00:00:00 2001 From: bgauduch Date: Sat, 2 Mar 2024 09:53:22 +0100 Subject: [PATCH 4/4] correct AZ_VERSION build arg --- .github/workflows/push-latest.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/push-latest.yml b/.github/workflows/push-latest.yml index ba7ebcd..0225b4b 100644 --- a/.github/workflows/push-latest.yml +++ b/.github/workflows/push-latest.yml @@ -54,11 +54,9 @@ jobs: - name: Set up QEMU uses: docker/setup-qemu-action@v2 - - name: Set up Buildx id: buildx uses: docker/setup-buildx-action@v2 - - name: Build and push container images uses: docker/build-push-action@v4 with: @@ -66,7 +64,7 @@ jobs: platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/386 build-args: | TERRAFORM_VERSION=${{ env.TF_VERSION }} - AWS_CLI_VERSION=${{ env.AWS_VERSION }} + AZURE_CLI_VERSION=${{ env.AZ_VERSION }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} push: true