so better

Author: embtom

.github/actions/prepare-builder/action.yml

@@ -25,18 +25,22 @@ runs:
       id: image-name
       shell: bash
       run: |
-        IMG=$(yq -r '.services."${{ inputs.service }}".image' docker-compose.yml)
-        echo "image=${IMG}" >> $GITHUB_OUTPUT
+        IMAGE=$(yq -r '.services."${{ inputs.service }}".image' docker-compose.yml)
+        BASE_IMAGE="${IMAGE%%:*}"
+        HASH=$(sha256sum Dockerfile | cut -d " " -f1)
+        echo "image=${IMAGE}" >> $GITHUB_OUTPUT
 
-        CACHE_TAG="ghcr.io/${{ github.repository_owner }}/cache-${IMG}"
-        echo "cache=${CACHE_TAG}" >> $GITHUB_OUTPUT
+        CACHE_IMAGE="ghcr.io/${{ github.repository_owner }}/cache-${BASE_IMAGE}:${HASH}"
+        
+        echo "hash=${HASH}" >> $GITHUB_OUTPUT
+        echo "cache-image=${CACHE_IMAGE}" >> $GITHUB_OUTPUT
 
     - name: Try pulling cache from GHCR
       id: pull-cache
       shell: bash
       run: |
-        echo "Trying to pull cache image: ${{ steps.image-name.outputs.cache }}"
-        if podman pull "${{ steps.image-name.outputs.cache }}"; then
+        echo "Trying to pull cache image: ${{ steps.image-name.outputs.cache-image }}"
+        if podman pull "${{ steps.image-name.outputs.cache-image }}"; then
           echo "cache-hit=true" >> $GITHUB_OUTPUT
         else
           echo "cache-hit=false" >> $GITHUB_OUTPUT
@@ -46,7 +50,7 @@ runs:
       if: steps.pull-cache.outputs.cache-hit == 'true'
       shell: bash
       run: |
-        podman tag "${{ steps.image-name.outputs.cache }}" \
+        podman tag "${{ steps.image-name.outputs.cache-image }}" \
           "${{ steps.image-name.outputs.image }}"
 
         echo "Loaded cached image: ${{ steps.image-name.outputs.image }}"
@@ -62,6 +66,6 @@ runs:
       shell: bash
       run: |
         podman tag "${{ steps.image-name.outputs.image }}" \
-          "${{ steps.image-name.outputs.cache }}"
+          "${{ steps.image-name.outputs.cache-image }}"
 
-        podman push "${{ steps.image-name.outputs.cache }}"
+        podman push "${{ steps.image-name.outputs.cache-image }}"