build-docker: Build from docker-builds with custom tag also.

.github/workflows/build-docker.yml

@@ -3,7 +3,7 @@ name: docker
 on:
   push:
     tags:
-      - docker-builds-dev/*
+      - docker-builds/*
 
 env:
   IMAGE_FQDN: ghcr.io/maldua/zimbra-foss-builder
@@ -13,13 +13,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+      - name: Split branch name
+        env:
+          BRANCH: ${{ github.ref_name }}
+        id: split-tag
+        run: echo "version=${BRANCH##*/}" >> $GITHUB_OUTPUT
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build the zimbra-foss-builder Docker image
+      - name: zimbra-foss-builder Docker image
         run: |
-          docker build --tag ghcr.io/maldua/zimbra-foss-builder:latest . -f Dockerfile-github-ubuntu-20.04
-          docker push ghcr.io/maldua/zimbra-foss-builder:latest
+          docker build --tag ${{ env.IMAGE_FQDN }}:latest . -f Dockerfile-github-ubuntu-20.04
+          docker push ${{ env.IMAGE_FQDN }}:latest
+          docker tag ${{ env.IMAGE_FQDN }}:latest ${{ env.IMAGE_FQDN }}:docker-${{ steps.split-tag.outputs.version }}
+          docker push ${{ env.IMAGE_FQDN }}:docker-${{ steps.split-tag.outputs.version }}