From fdf7cda2c11f9c4b489997e57d2731fb93463ba2 Mon Sep 17 00:00:00 2001
From: Liran Mimony <liran@odigos.io>
Date: Tue, 23 Jun 2026 12:34:55 +0300
Subject: [PATCH] fix: Set workflow to implicitly upload the docker image to
 the private Docker repo after building it

---
 .github/workflows/release.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f9a6d0e..7fb7b19 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -64,7 +64,8 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      # Build packages (both archs) and multi-arch image; image is pushed to GCP_REGISTRY when PUSH=1
+      # Build packages (both archs) and multi-arch image; image is pushed to GCP_REGISTRY when PUSH=1,
+      # then the same manifest is copied to GCP_PRIVATE_REGISTRY so both registries hold an identical image.
       - name: Build and package ${{ matrix.service }}
         working-directory: ${{ matrix.service }}
         run: |
@@ -72,14 +73,17 @@ jobs:
             TAG="${{ env.TAG }}" \
             REGISTRY="${{ env.GCP_REGISTRY }}" \
             PUSH=1
+          docker buildx imagetools create \
+            --tag "${{ env.GCP_PRIVATE_REGISTRY }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}" \
+            "${{ env.GCP_REGISTRY }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}"
 
-      # Copy the multi-arch manifest list from GCP to GHCR (demo has no image)
+      # Copy the multi-arch manifest list from GCP to GHCR (demo has no image).
+      # Both GCP registries are identical, so a single source is used here.
       - name: Tag and push multi-arch image to GitHub Container Registry
         if: matrix.service != 'demo'
         run: |
           docker buildx imagetools create --tag "ghcr.io/${{ github.repository }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}" \
-            "${{ env.GCP_REGISTRY }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}" \
-            "${{ env.GCP_PRIVATE_REGISTRY }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}"
+            "${{ env.GCP_REGISTRY }}/odigos-demo-${{ matrix.service }}:${{ env.TAG }}"
 
       - name: Upload Linux packages to Artifact Registry
         if: matrix.service != 'demo'