GHA

IMIO · Sep 10, 2024 · f343982 · f343982
1 parent 7bddf97
commit f343982
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.github/workflows/docker-publish-branch.yml b/.github/workflows/docker-publish-branch.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
           IMAGE_TAGS: |
-            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:latest
+            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
           REGISTRY_URL: ${{ secrets.HARBOR_URL }}
           REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}

diff --git a/.github/workflows/docker-publish-latest.yml b/.github/workflows/docker-publish-latest.yml
@@ -22,7 +22,7 @@ jobs:
         with:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
           IMAGE_TAGS: |
-            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:latest
+            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
           REGISTRY_URL: ${{ secrets.HARBOR_URL }}
           REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}
           REGISTRY_PASSWORD: ${{ secrets.DELIB_HARBOR_PASSWORD }}

diff --git a/.github/workflows/docker-publish-release.yml b/.github/workflows/docker-publish-release.yml
@@ -6,8 +6,10 @@ on:
       - '**'
 
 env:
-  IMAGE_NAME: delib/deliberationsbe
   BUILD_NUMBER: ${{ github.run_id }}.${{ github.run_number }}.${{ github.run_attempt }}
+  BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
+  IMAGE_NAME: delib/deliberationsbe
+  IMAGE_VERSION: ${{ github.ref_name }}
 
 jobs:
   docker:
@@ -19,7 +21,7 @@ jobs:
         with:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
           IMAGE_TAGS: |
-            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
+            ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:${{ env.IMAGE_VERSION }}
             ${{ secrets.HARBOR_URL }}/${{ env.IMAGE_NAME }}:latest
           REGISTRY_URL: ${{ secrets.HARBOR_URL }}
           REGISTRY_USERNAME: ${{ secrets.DELIB_HARBOR_USERNAME }}