Fixes to CI build

Author: kenkendk

.github/workflows/create-dev-image.yml

@@ -18,11 +18,18 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set image tag vars
+        run: |
+          echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+          NAME=${GITHUB_REF_NAME#release/}
+          NAME=${NAME//\//-}
+          echo "BRANCH_TAG=$NAME" >> $GITHUB_ENV
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            duplicati/console-ingress:$(echo $GITHUB_SHA | head -c7)
+            duplicati/console-ingress:${{ env.SHORT_SHA }}
             duplicati/console-ingress:dev-latest

.github/workflows/create-prod-image.yml

@@ -24,12 +24,19 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Set image tag vars
+        run: |
+          echo "SHORT_SHA=${GITHUB_SHA::7}" >> $GITHUB_ENV
+          NAME=${GITHUB_REF_NAME#release/}
+          NAME=${NAME//\//-}
+          echo "BRANCH_TAG=$NAME" >> $GITHUB_ENV
+
       - name: Build and push
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
           tags: |
-            duplicati/console-ingress:$(echo $GITHUB_SHA | head -c7)
+            duplicati/console-ingress:${{ env.SHORT_SHA }}
             duplicati/console-ingress:latest
-            duplicati/console-ingress:$(echo ${GITHUB_REF_NAME#release/})
+            duplicati/console-ingress:${{ env.BRANCH_TAG }}