From 8cdf78f8af0229e1b5fc1cf1c335815e6c8bc568 Mon Sep 17 00:00:00 2001
From: bo0tzz <git@bo0tzz.me>
Date: Tue, 18 Feb 2025 19:51:42 +0100
Subject: [PATCH] chore: refactor to create manifest before pushing

---
 .github/workflows/docker.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 5429d8671d..4fd5a0976b 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -367,7 +367,7 @@ jobs:
   merge_server:
     name: Merge & Push Server
     runs-on: ubuntu-latest
-    if: ${{ needs.pre-job.outputs.should_run_server == 'true' && !github.event.pull_request.head.repo.fork }}
+    if: ${{ needs.pre-job.outputs.should_run_server == 'true' }}
     env:
       GHCR_REPO: ghcr.io/${{ github.repository_owner }}/immich-server
       DOCKER_REPO: altran1502/immich-server
@@ -389,6 +389,7 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GHCR
+        if: ${{ !github.event.pull_request.head.repo.fork }}
         uses: docker/login-action@v3
         with:
           registry: ghcr.io
@@ -419,11 +420,13 @@ jobs:
             type=ref,event=tag,suffix=${{ matrix.suffix }}
             type=raw,value=release,enable=${{ github.event_name == 'release' }},suffix=${{ matrix.suffix }}
 
-      - name: Create manifest list and push
+      - name: Create manifest
         working-directory: ${{ runner.temp }}/digests
-        run: |
-          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
-            $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
+        run: docker buildx imagetools create -t merged-manifest $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *)
+
+      - name: Push
+        if: ${{ !github.event.pull_request.head.repo.fork }}
+        run: docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") merged-manifest
 
   success-check-server:
     name: Docker Build & Push Server Success