From 30db307d707ca92cfff064b705de666ff9f67afa Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Tue, 17 Feb 2026 20:07:58 +0000
Subject: [PATCH] build(docker): push amd64 image before overwriting manifest
 with both amd64 and arm64 platforms

---
 docker/production/.gitlab-ci.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docker/production/.gitlab-ci.yml b/docker/production/.gitlab-ci.yml
index a4372f54..0b2ee2d5 100644
--- a/docker/production/.gitlab-ci.yml
+++ b/docker/production/.gitlab-ci.yml
@@ -80,7 +80,17 @@ docker-build-release:
     # configure BuildKit features that aren't enabled by default
     - docker buildx inspect --bootstrap
   script:
-    # build multiplatform image for amd64 and arm64
+    - docker buildx build
+      --target production
+      --secret id=maxmind-licence-key,env=MAXMIND_LICENCE_KEY
+      --platform linux/amd64
+      --file docker/production/Dockerfile
+      --push
+      --tag ${DOCKER_IMAGE_CASTOPOD}:${CP_VERSION}
+      --tag ${DOCKER_IMAGE_CASTOPOD}:${CP_TAG}
+      .
+    # when --platform=linux/amd64,linux/arm64: amd64 image takes too long to be pushed as it needs to wait for arm64 to be built
+    # --> build and push amd64 image first, then overwrite manifest after building arm64
     - docker buildx build
       --target production
       --secret id=maxmind-licence-key,env=MAXMIND_LICENCE_KEY
@@ -89,7 +99,6 @@ docker-build-release:
       --push
       --tag ${DOCKER_IMAGE_CASTOPOD}:${CP_VERSION}
       --tag ${DOCKER_IMAGE_CASTOPOD}:${CP_TAG}
-      --progress=plain
       .
   rules:
     - if: $CI_COMMIT_TAG