From 4ffc8b9ff7bd4630548d864c57777bb7e9169c5f Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Wed, 27 Mar 2024 17:20:30 +0100 Subject: [PATCH 1/3] Fixup failing build --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 1230bb3..cdfc7a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -27,6 +27,7 @@ jobs: runs-on: ubuntu-latest needs: pre-commit strategy: + fail-fast: ${{ github.ref_name == 'master' && false || true }} matrix: base_image: - flavor: centos @@ -138,5 +139,4 @@ jobs: SRC_IMAGE: quay.io/${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }} DST_IMAGE: ${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }} run: | - docker tag ${{ env.SRC_IMAGE }} ${{ env.DST_IMAGE }} - docker push ${{ env.DST_IMAGE }} + docker buildx imagetools create ${{ env.SRC_IMAGE }} -t ${{ env.DST_IMAGE }} From c2a547c06f14f5e00cc9753c649faad5105cc79c Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Wed, 27 Mar 2024 17:20:51 +0100 Subject: [PATCH 2/3] test docker push --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index cdfc7a3..aec5f6b 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Login to docker.io - if: github.ref_name == 'master' + if: github.ref_name != 'master' uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -134,7 +134,7 @@ jobs: target: JAVA_BASE_IMAGE - name: Push Image to docker.io - if: github.ref_name == 'master' + if: github.ref_name != 'master' env: SRC_IMAGE: quay.io/${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }} DST_IMAGE: ${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }} From fdb8512bb84266605a0d00ef33c990ce570fe664 Mon Sep 17 00:00:00 2001 From: Giovanni Toraldo Date: Wed, 27 Mar 2024 17:36:04 +0100 Subject: [PATCH 3/3] Revert "test docker push" This reverts commit c2a547c06f14f5e00cc9753c649faad5105cc79c. --- .github/workflows/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index aec5f6b..cdfc7a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,7 +80,7 @@ jobs: password: ${{ secrets.QUAY_PASSWORD }} - name: Login to docker.io - if: github.ref_name != 'master' + if: github.ref_name == 'master' uses: docker/login-action@e92390c5fb421da1463c202d546fed0ec5c39f20 # v3.1.0 with: username: ${{ secrets.DOCKER_USERNAME }} @@ -134,7 +134,7 @@ jobs: target: JAVA_BASE_IMAGE - name: Push Image to docker.io - if: github.ref_name != 'master' + if: github.ref_name == 'master' env: SRC_IMAGE: quay.io/${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }} DST_IMAGE: ${{ env.IMAGE_REGISTRY_NAMESPACE }}/${{ env.IMAGE_REPOSITORY }}:${{ steps.vars.outputs.image_tag }}