Merge pull request #37 from CSUSTers/dev

fix: no branch info in released docker image
CSUSTers · Jan 24, 2021 · ecf5623 · ecf5623
2 parents ca95cad + 016db28
commit ecf5623
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/docker_push.yml b/.github/workflows/docker_push.yml
@@ -2,7 +2,7 @@ name: Docker Image Push
 
 on:
   push:
-    branches: [ dev ]
+    branches: [ dev, master ]
 
 
 jobs:
@@ -16,9 +16,11 @@ jobs:
         uses: actions/checkout@v2
 
       - name: "Print Version"
+        id: "version"
         run: |
-          echo 'Version:' $(git branch --show-current)-$(git rev-parse --short HEAD)
-          
+          echo "Version:" $(git branch --show-current)-$(git rev-parse --short HEAD)
+          echo "::set-output name=branch::$(git branch --show-current)"
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -38,7 +40,7 @@ jobs:
           context: .
           push: true
           tags: |
-            csust/csust-got:latest-dev
+            csust/csust-got:latest-${{ steps.version.outputs.branch }}
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.github/workflows/docker_push_release.yml b/.github/workflows/docker_push_release.yml
@@ -42,7 +42,8 @@ jobs:
             csust/csust-got:latest
             csust/csust-got:${{ steps.version.outputs.tag }}
           build-args: |
-            TAG=${{ steps.version.outputs.tag}}
+            TAG=${{ steps.version.outputs.tag }}
+            BRANCH=release
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}