From f7d320ac3278c60cbca976ad5da95f9d2fdd05b6 Mon Sep 17 00:00:00 2001 From: Anthony Stirling <77850077+Frooodle@users.noreply.github.com> Date: Mon, 6 Feb 2023 12:39:26 +0000 Subject: [PATCH] Update push-docker.yml --- .github/workflows/push-docker.yml | 32 ++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/.github/workflows/push-docker.yml b/.github/workflows/push-docker.yml index e144c2ea..0aefaa00 100644 --- a/.github/workflows/push-docker.yml +++ b/.github/workflows/push-docker.yml @@ -39,18 +39,18 @@ jobs: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_API }} - - name: Check if tag exists - id: checkIdExists - continue-on-error: true - run: | - response=$(curl -s https://hub.docker.com/v2/repositories/frooodle/s-pdf/tags/?name=${{ steps.versionNumber.outputs.versionNumber }}) - result=$(echo $response | jq ".results") - if [ "$result" == "[]" ]; then - echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} doesnt exist. Continuing with build and push." - else - echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} already exists. Skipping build and push." - exit 1; - fi + # - name: Check if tag exists + # id: checkIdExists + # continue-on-error: true + # run: | + # response=$(curl -s https://hub.docker.com/v2/repositories/frooodle/s-pdf/tags/?name=${{ steps.versionNumber.outputs.versionNumber }}) + # result=$(echo $response | jq ".results") + # if [ "$result" == "[]" ]; then + # echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} doesnt exist. Continuing with build and push." + # else + # echo "Tag ${{ steps.versionNumber.outputs.versionNumber }} already exists. Skipping build and push." + # exit 1; + # fi @@ -58,9 +58,15 @@ jobs: run: | docker buildx create --name mybuilder docker buildx use mybuilder + + - name: Build and push versioned amd64 and v8 + if: github.ref == 'refs/heads/main' + run: | + docker buildx build --platform="linux/amd64,linux/arm64/v8" --push --tag "frooodle/s-pdf:${{ steps.versionNumber.outputs.versionNumber }}-alpha" . + - name: Build and push versioned amd64 and v8 - if: github.ref == 'refs/heads/main' && steps.checkIdExists.outcome != 'failure' + if: github.ref == 'refs/heads/master' run: | docker buildx build --platform="linux/amd64,linux/arm64/v8" --push --tag "frooodle/s-pdf:${{ steps.versionNumber.outputs.versionNumber }}" .