From 02c4e456d5b3a7524a279fd9126806f449ad7147 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sun, 21 Jan 2024 14:20:36 -0500 Subject: [PATCH 1/4] mod-builder: add multi arch support --- .github/workflows/docker-mod-builder.yml | 150 ++++++++++++++++++----- 1 file changed, 116 insertions(+), 34 deletions(-) diff --git a/.github/workflows/docker-mod-builder.yml b/.github/workflows/docker-mod-builder.yml index a25e7c0..8d04ece 100644 --- a/.github/workflows/docker-mod-builder.yml +++ b/.github/workflows/docker-mod-builder.yml @@ -18,6 +18,9 @@ on: MOD_VERSION: required: false type: string + MULTI_ARCH: + required: false + type: string secrets: CR_USER: required: false @@ -54,33 +57,54 @@ jobs: echo "GITHUB_REPO=${{ inputs.GITHUB_REPO }}" >> $GITHUB_STEP_SUMMARY echo "MOD_VERSION=${{ inputs.MOD_VERSION }}" >> $GITHUB_ENV echo "MOD_VERSION=${{ inputs.MOD_VERSION }}" >> $GITHUB_STEP_SUMMARY + echo "MULTI_ARCH=${{ inputs.MULTI_ARCH }}" >> $GITHUB_ENV + echo "MULTI_ARCH=${{ inputs.MULTI_ARCH }}" >> $GITHUB_STEP_SUMMARY - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Build image run: | - docker buildx build --no-cache --build-arg MOD_VERSION=${MOD_VERSION} -t ${{ github.sha }} . + docker buildx build --no-cache --build-arg MOD_VERSION=${MOD_VERSION} -t ${{ github.sha }} --platform linux/amd64 . + if [[ "${MULTI_ARCH}" == "true" ]]; then + docker buildx build --no-cache --build-arg MOD_VERSION=${MOD_VERSION} -t arm64v8-${{ github.sha }} --platform linux/arm64/v8 . + fi - name: Tag image (Commit) if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository }} run: | - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} + DOCKERHUB_TAGS="${ENDPOINT}:${BASEIMAGE}-${MODNAME} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}" if [[ -n "${MOD_VERSION}" ]]; then - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} - docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }} + DOCKERHUB_TAGS="${DOCKERHUB_TAGS} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }}" + fi + echo "DOCKERHUB_TAGS=${DOCKERHUB_TAGS}" >> $GITHUB_ENV + if [[ "${MULTI_ARCH}" == "true" ]]; then + for i in ${DOCKERHUB_TAGS}; do + docker tag ${{ github.sha }} ${i/:/:amd64-} + docker tag arm64v8-${{ github.sha }} ${i/:/:arm64v8-} + ighcr="${i/#/ghcr.io\/}" + docker tag ${{ github.sha }} ${ighcr/:/:amd64-} + docker tag arm64v8-${{ github.sha }} ${ighcr/:/:arm64v8-} + done + else + for i in ${DOCKERHUB_TAGS}; do + docker tag ${{ github.sha }} ${i} + docker tag ${{ github.sha }} ${i/#/ghcr.io\/} + done fi - name: Tag image (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }} run: | - docker tag ${{ github.sha }} ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} - docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + if [[ "${MULTI_ARCH}" == "true" ]]; then + docker tag ${{ github.sha }} ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} + docker tag arm64v8-${{ github.sha }} ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + docker tag arm64v8-${{ github.sha }} ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + else + docker tag ${{ github.sha }} ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + fi - name: Credential check if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository || env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }} @@ -104,24 +128,53 @@ jobs: - name: Push tags to GitHub Container Registry (Commit) if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository && env.CR_USER && env.CR_PAT }} run: | - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY - echo "ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}" >> $GITHUB_STEP_SUMMARY - echo "ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}" >> $GITHUB_STEP_SUMMARY - if [[ -n "${MOD_VERSION}" ]]; then - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} - docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }} - echo "ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}" >> $GITHUB_STEP_SUMMARY - echo "ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }}" >> $GITHUB_STEP_SUMMARY + if [[ "${MULTI_ARCH}" == "true" ]]; then + echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + ighcr="${i/#/ghcr.io\/}" + docker push ${ighcr/:/:amd64-} + echo "${ighcr/:/:amd64-}" >> $GITHUB_STEP_SUMMARY + docker push ${ighcr/:/:arm64v8-} + echo "${ighcr/:/:arm64v8-}" >> $GITHUB_STEP_SUMMARY + done + echo "Pushed the following manifests to GHCR:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + ighcr="${i/#/ghcr.io\/}" + docker manifest push --purge ${ighcr} || : + docker manifest create ${ighcr} ${ighcr/:/:amd64-} ${ighcr/:/:arm64v8-} + docker manifest annotate ${ighcr} ${ighcr/:/:arm64v8-} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${ighcr} + echo "${ighcr}" >> $GITHUB_STEP_SUMMARY + done + else + echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + ighcr="${i/#/ghcr.io\/}" + docker push ${ighcr} + echo "${ighcr}" >> $GITHUB_STEP_SUMMARY + done fi - name: Push tags to GitHub Container Registry (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }} run: | - docker push ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} - echo "Pushed the following PR image/tag to GHCR:" >> $GITHUB_STEP_SUMMARY - echo "ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + if [[ "${MULTI_ARCH}" == "true" ]]; then + docker push ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} + docker push ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + echo "ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + echo "ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + docker manifest push --purge ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} || : + docker manifest create ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + docker manifest annotate ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} --os linux --arch arm64 --variant v8 + docker manifest push --purge ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR manifest to GHCR:" >> $GITHUB_STEP_SUMMARY + echo "ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + else + docker push ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR image/tag to GHCR:" >> $GITHUB_STEP_SUMMARY + echo "ghcr.io/${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + fi - name: Add GHCR push comment to PR uses: peter-evans/create-or-update-comment@v3.1.0 @@ -140,16 +193,28 @@ jobs: - name: Push tags to DockerHub (Commit) if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository && env.DOCKERUSER && env.DOCKERPASS }} run: | - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME} - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - echo "Pushed the following images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY - echo "${ENDPOINT}:${BASEIMAGE}-${MODNAME}" >> $GITHUB_STEP_SUMMARY - echo "${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}" >> $GITHUB_STEP_SUMMARY - if [[ -n "${MOD_VERSION}" ]]; then - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} - docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }} - echo "${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}" >> $GITHUB_STEP_SUMMARY - echo "${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }}" >> $GITHUB_STEP_SUMMARY + if [[ "${MULTI_ARCH}" == "true" ]]; then + echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + docker push ${i/:/:amd64-} + echo "${i/:/:amd64-}" >> $GITHUB_STEP_SUMMARY + docker push ${i/:/:arm64v8-} + echo "${i/:/:arm64v8-}" >> $GITHUB_STEP_SUMMARY + done + echo "Pushed the following manifests to Docker Hub:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + docker manifest push --purge ${i} || : + docker manifest create ${i} ${i/:/:amd64-} ${i/:/:arm64v8-} + docker manifest annotate ${i} ${i/:/:arm64v8-} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${i} + echo "${i}" >> $GITHUB_STEP_SUMMARY + done + else + echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + for i in ${DOCKERHUB_TAGS}; do + docker push ${i} + echo "${i}" >> $GITHUB_STEP_SUMMARY + done fi - name: Push tags to DockerHub (PR) @@ -158,3 +223,20 @@ jobs: docker push ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} echo "Pushed the following PR image/tag to Docker Hub:" >> $GITHUB_STEP_SUMMARY echo "${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + if [[ "${MULTI_ARCH}" == "true" ]]; then + docker push ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} + docker push ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY + echo "${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + echo "${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + docker manifest push --purge ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} || : + docker manifest create ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} + docker manifest annotate ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} --os linux --arch arm64 --variant v8 + docker manifest push --purge ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR manifest to Docker Hub:" >> $GITHUB_STEP_SUMMARY + echo "${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + else + docker push ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} + echo "Pushed the following PR image/tag to Docker Hub:" >> $GITHUB_STEP_SUMMARY + echo "${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY + fi From a2daaeac47ec5e1581ca6f108ff5df9a2d182f34 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sun, 21 Jan 2024 14:30:45 -0500 Subject: [PATCH 2/4] Fix typos --- .github/workflows/docker-mod-builder.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-mod-builder.yml b/.github/workflows/docker-mod-builder.yml index 8d04ece..dceba0b 100644 --- a/.github/workflows/docker-mod-builder.yml +++ b/.github/workflows/docker-mod-builder.yml @@ -194,7 +194,7 @@ jobs: if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository && env.DOCKERUSER && env.DOCKERPASS }} run: | if [[ "${MULTI_ARCH}" == "true" ]]; then - echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + echo "Pushed the following images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY for i in ${DOCKERHUB_TAGS}; do docker push ${i/:/:amd64-} echo "${i/:/:amd64-}" >> $GITHUB_STEP_SUMMARY @@ -210,7 +210,7 @@ jobs: echo "${i}" >> $GITHUB_STEP_SUMMARY done else - echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY + echo "Pushed the following images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY for i in ${DOCKERHUB_TAGS}; do docker push ${i} echo "${i}" >> $GITHUB_STEP_SUMMARY From 67fdb70dd59cc494bada33bec2a3d8438f39a368 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Sun, 21 Jan 2024 14:56:31 -0500 Subject: [PATCH 3/4] remove obsolete code --- .github/workflows/docker-mod-builder.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-mod-builder.yml b/.github/workflows/docker-mod-builder.yml index dceba0b..e113476 100644 --- a/.github/workflows/docker-mod-builder.yml +++ b/.github/workflows/docker-mod-builder.yml @@ -220,9 +220,6 @@ jobs: - name: Push tags to DockerHub (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }} run: | - docker push ${ENDPOINT}:pull_request_${{ github.event.pull_request.number }} - echo "Pushed the following PR image/tag to Docker Hub:" >> $GITHUB_STEP_SUMMARY - echo "${ENDPOINT}:pull_request_${{ github.event.pull_request.number }}" >> $GITHUB_STEP_SUMMARY if [[ "${MULTI_ARCH}" == "true" ]]; then docker push ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} docker push ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} From f1327e8cc3660d8fa9c5f76da71e8eccc7282b67 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Wed, 14 Feb 2024 09:34:50 -0500 Subject: [PATCH 4/4] make MULTI_ARCH case insensitive --- .github/workflows/docker-mod-builder.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/docker-mod-builder.yml b/.github/workflows/docker-mod-builder.yml index e113476..f166d1f 100644 --- a/.github/workflows/docker-mod-builder.yml +++ b/.github/workflows/docker-mod-builder.yml @@ -66,7 +66,7 @@ jobs: - name: Build image run: | docker buildx build --no-cache --build-arg MOD_VERSION=${MOD_VERSION} -t ${{ github.sha }} --platform linux/amd64 . - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then docker buildx build --no-cache --build-arg MOD_VERSION=${MOD_VERSION} -t arm64v8-${{ github.sha }} --platform linux/arm64/v8 . fi @@ -78,7 +78,7 @@ jobs: DOCKERHUB_TAGS="${DOCKERHUB_TAGS} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${MOD_VERSION}-${{ github.sha }}" fi echo "DOCKERHUB_TAGS=${DOCKERHUB_TAGS}" >> $GITHUB_ENV - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then for i in ${DOCKERHUB_TAGS}; do docker tag ${{ github.sha }} ${i/:/:amd64-} docker tag arm64v8-${{ github.sha }} ${i/:/:arm64v8-} @@ -96,7 +96,7 @@ jobs: - name: Tag image (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) }} run: | - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then docker tag ${{ github.sha }} ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} docker tag arm64v8-${{ github.sha }} ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} @@ -128,7 +128,7 @@ jobs: - name: Push tags to GitHub Container Registry (Commit) if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository && env.CR_USER && env.CR_PAT }} run: | - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then echo "Pushed the following images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY for i in ${DOCKERHUB_TAGS}; do ighcr="${i/#/ghcr.io\/}" @@ -158,7 +158,7 @@ jobs: - name: Push tags to GitHub Container Registry (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.CR_USER && env.CR_PAT }} run: | - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then docker push ghcr.io/${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} docker push ghcr.io/${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} echo "Pushed the following PR images/tags to GHCR:" >> $GITHUB_STEP_SUMMARY @@ -193,7 +193,7 @@ jobs: - name: Push tags to DockerHub (Commit) if: ${{ (github.event_name == 'push' || github.event_name == 'workflow_dispatch') && github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.GITHUB_REPO == github.repository && env.DOCKERUSER && env.DOCKERPASS }} run: | - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then echo "Pushed the following images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY for i in ${DOCKERHUB_TAGS}; do docker push ${i/:/:amd64-} @@ -220,7 +220,7 @@ jobs: - name: Push tags to DockerHub (PR) if: ${{ env.GITHUB_REPO == format('{0}/{1}', github.event.pull_request.base.repo.owner.login, github.event.pull_request.base.repo.name) && env.DOCKERUSER && env.DOCKERPASS }} run: | - if [[ "${MULTI_ARCH}" == "true" ]]; then + if [[ "${MULTI_ARCH,,}" == "true" ]]; then docker push ${ENDPOINT}:amd64-pull_request_${{ github.event.pull_request.number }} docker push ${ENDPOINT}:arm64v8-pull_request_${{ github.event.pull_request.number }} echo "Pushed the following PR images/tags to Docker Hub:" >> $GITHUB_STEP_SUMMARY