Adjust docker tags for dev releases

Author: phlmn

.github/workflows/.build-push-docker-image.yml

@@ -18,6 +18,10 @@ on:
       cache_mode:
         type: string
         default: min
+      raw_tag:
+        type: string
+      version_tag:
+        type: string
 
 jobs:
   build-and-push-image:
@@ -44,12 +48,8 @@ jobs:
         with:
           images: ${{ inputs.registry }}/${{ inputs.image_name }}
           tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=tag
-            type=ref,event=pr
-            # set latest tag for main branch
-            type=raw,value=latest,enable=${{ github.ref_name == 'main' }}
+            type=semver,pattern={{version}},enable=${{ github.version_tag != '' }}
+            type=raw,value=${{ github.raw_tag }},enable=${{ github.raw_tag != '' }}
 
       - name: "Build${{ inputs.push && ' and push' || ''  }}"
         uses: docker/build-push-action@v7

.github/workflows/docker-images.yml

@@ -2,8 +2,6 @@ name: Docker images
 
 on:
   pull_request:
-  push:
-    branches: [main]
   merge_group:
 
 permissions:
@@ -16,13 +14,11 @@ jobs:
     with:
       image_name: ${{ github.repository }}
       dockerfile: ./packaging/docker/Dockerfile
-      push: ${{ github.ref_name == 'main' }}
       cache_mode: max
 
   worker:
     uses: ./.github/workflows/.build-push-docker-image.yml
     with:
       image_name: ${{ github.repository }}-worker
       dockerfile: ./packaging/docker/worker.Dockerfile
-      push: ${{ github.ref_name == 'main' }}
       cache_mode: off # cache is really slow for this file

.github/workflows/build-and-release.yml .github/workflows/release.yml.github/workflows/build-and-release.yml renamed to .github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: Build and release
+name: Release
 
 on:
   push:
@@ -25,28 +25,29 @@ jobs:
           path: worker/packaging/build/worker-${{matrix.target}}.tar.xz
           archive: false
 
-  docker-backend:
+  push-docker-backend:
     uses: ./.github/workflows/.build-push-docker-image.yml
     with:
       image_name: ${{ github.repository }}
+      raw_tag: dev+${{ github.sha }}
       dockerfile: ./packaging/docker/Dockerfile
-      push: ${{ github.ref_name == 'main' }}
+      push: true
       cache_mode: max
 
-  docker-worker:
+  push-docker-worker:
     uses: ./.github/workflows/.build-push-docker-image.yml
     with:
       image_name: ${{ github.repository }}-worker
+      raw_tag: dev+${{ github.sha }}
       dockerfile: ./packaging/docker/worker.Dockerfile
-      push: ${{ github.ref_name == 'main' }}
+      push: true
       cache_mode: off # cache is really slow for this file
 
-
-  release:
+  upload-release:
     needs:
       - build-worker-bundles
-      - docker-backend
-      - docker-worker
+      - push-docker-backend
+      - push-docker-worker
     runs-on: ubuntu-latest
     steps:
       - uses: actions/download-artifact@v8