From 3add645b853b3bae12470e449a28a1ab47f15b55 Mon Sep 17 00:00:00 2001
From: Hendrik Kleinwaechter <hendrik.kleinwaechter@gmail.com>
Date: Thu, 7 Dec 2023 11:08:33 +0100
Subject: [PATCH] Fix

---
 .github/workflows/docker_build_push.yml   | 7 ++-----
 .github/workflows/validate-book-build.yml | 6 +++---
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/docker_build_push.yml b/.github/workflows/docker_build_push.yml
index 036e3ace..7798b5c0 100644
--- a/.github/workflows/docker_build_push.yml
+++ b/.github/workflows/docker_build_push.yml
@@ -30,12 +30,9 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
-          tags: 
-            # Latest for main, else branch name
+          tags: |
+            type=raw,value=${{ github.ref }},enable=${{ github.ref != format('refs/heads/{0}', 'main') }}
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
-
-      - name: Print tags
-        run: echo "Tags: ${{ steps.meta.outputs.tags }}"
       - name: Build and push Docker image
         uses: docker/build-push-action@v5
         with:
diff --git a/.github/workflows/validate-book-build.yml b/.github/workflows/validate-book-build.yml
index c381a2d2..51c6c668 100644
--- a/.github/workflows/validate-book-build.yml
+++ b/.github/workflows/validate-book-build.yml
@@ -9,13 +9,13 @@ on:
 jobs:
   test_building_book:
     runs-on: ubuntu-latest
-      env:
-        IMAGE: ghcr.io/hendricius/the-sourdough-framework:${{ github.ref_slug }}
+    env:
+      IMAGE: ghcr.io/hendricius/the-sourdough-framework:${{ github.event.pull_request.head.ref }}
     steps:
       - name: Set up git repository
         uses: actions/checkout@v3
       - name: Build and Push Docker Image
-          uses: ./.github/workflows/docker_build_push.yml
+        uses: ./.github/workflows/docker_build_push.yml
       - name: Print dependency versions
         uses: addnab/docker-run-action@v3
         with: