Feat/image on push (#119)

Author: danimhr

.github/workflows/push-rust-services.yaml

@@ -3,6 +3,8 @@ on:
   push:
     tags:
       - v*
+    branches:
+      - main
   workflow_dispatch:
     inputs:
       dispatch_description:
@@ -21,16 +23,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Set image tag to version of the git tag
-        if: ${{ startsWith(github.ref, 'refs/tags/server-v') }}
-        run: |
-          PREFIX="refs/tags/server-"
-          VERSION="${GITHUB_REF:${#PREFIX}}"
-          echo "IMAGE_TAG=${VERSION}" >> "${GITHUB_ENV}"
-      - name: Set image tag to the git commit hash
-        if: ${{ !startsWith(github.ref, 'refs/tags/server-v') }}
-        run: |
-          echo "IMAGE_TAG=${{ github.sha }}" >> "${GITHUB_ENV}"
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
@@ -42,11 +34,17 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          tags: |
+            type=sha,event=branch
+            type=ref,event=tag
       - name: Extract metadata (tags, labels) for Docker
         id: meta_monitor
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}-monitor
+          tags: |
+            type=sha,event=branch
+            type=ref,event=tag
       - name: Build and push server docker image
         uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
         with: