From a1bf989a236d221bde7399c2f955fb2e94646b7e Mon Sep 17 00:00:00 2001 From: Niven Date: Wed, 20 Mar 2024 15:31:02 +0800 Subject: [PATCH 1/4] Add multi tagging with latest tag on build release workflow --- .github/workflows/build-dev.yaml | 12 ++++++++++-- .github/workflows/build-release.yaml | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 182bd66f46..6c640da756 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -128,8 +128,16 @@ jobs: username: ${{ env.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - - name: Push to Docker Hub + - name: Tag version to built image run: | set -e; ver=${{ env.BUILD_VERSION }} docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} - docker push defi/defichain:${ver} + + - name: Tag latest to built image + if: env.BUILD_VERSION != 'latest' + run: | + set -e; ver=${{ env.BUILD_VERSION }} + docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:latest + + - name: Push to Docker Hub + run: docker push defi/defichain --all-tags diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index d0fce279bc..b2661d3c28 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -107,8 +107,16 @@ jobs: username: ${{ env.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - - name: Push to Docker Hub + - name: Tag version to built image run: | set -e; ver=${{ env.BUILD_VERSION }} docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} - docker push defi/defichain:${ver} + + - name: Tag latest to built image + if: env.BUILD_VERSION != 'latest' + run: | + set -e; ver=${{ env.BUILD_VERSION }} + docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:latest + + - name: Push to Docker Hub + run: docker push defi/defichain --all-tags From 79c7ac8f6cd94d2c2c181f574958442c17e29de7 Mon Sep 17 00:00:00 2001 From: Niven Date: Wed, 20 Mar 2024 16:24:12 +0800 Subject: [PATCH 2/4] Revert workflow testing on build-dev --- .github/workflows/build-dev.yaml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-dev.yaml b/.github/workflows/build-dev.yaml index 6c640da756..182bd66f46 100644 --- a/.github/workflows/build-dev.yaml +++ b/.github/workflows/build-dev.yaml @@ -128,16 +128,8 @@ jobs: username: ${{ env.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - - name: Tag version to built image + - name: Push to Docker Hub run: | set -e; ver=${{ env.BUILD_VERSION }} docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} - - - name: Tag latest to built image - if: env.BUILD_VERSION != 'latest' - run: | - set -e; ver=${{ env.BUILD_VERSION }} - docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:latest - - - name: Push to Docker Hub - run: docker push defi/defichain --all-tags + docker push defi/defichain:${ver} From 512cf01c3612d03de6b1d64d055ede566b22bbcc Mon Sep 17 00:00:00 2001 From: Niven Date: Wed, 20 Mar 2024 16:29:19 +0800 Subject: [PATCH 3/4] Better explicit docker push of tagged images --- .github/workflows/build-release.yaml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index b2661d3c28..b98dff4863 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -107,16 +107,10 @@ jobs: username: ${{ env.DOCKER_HUB_USER }} password: ${{ secrets.DOCKER_HUB_TOKEN }} - - name: Tag version to built image + - name: Push to Docker Hub run: | set -e; ver=${{ env.BUILD_VERSION }} docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} - - - name: Tag latest to built image - if: env.BUILD_VERSION != 'latest' - run: | - set -e; ver=${{ env.BUILD_VERSION }} docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:latest - - - name: Push to Docker Hub - run: docker push defi/defichain --all-tags + docker push defi/defichain:${ver} + docker push defi/defichain:latest From 434ab0477622bca7ab4be661d43296790eeb09ac Mon Sep 17 00:00:00 2001 From: Niven Date: Wed, 20 Mar 2024 16:32:59 +0800 Subject: [PATCH 4/4] Better refactor --- .github/workflows/build-release.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build-release.yaml b/.github/workflows/build-release.yaml index b98dff4863..6027de98f9 100644 --- a/.github/workflows/build-release.yaml +++ b/.github/workflows/build-release.yaml @@ -110,7 +110,6 @@ jobs: - name: Push to Docker Hub run: | set -e; ver=${{ env.BUILD_VERSION }} - docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} - docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:latest + docker tag defichain-${{ env.TARGET }}:${ver} defi/defichain:${ver} defi/defichain:latest docker push defi/defichain:${ver} docker push defi/defichain:latest