Ensure builder in main to fix race conditions

Julien-Ben · Julien-Ben · commit 1badff018357 · 2025-08-08T11:38:40.000+02:00
diff --git a/scripts/release/build_context.py b/scripts/release/build_context.py
@@ -83,7 +83,7 @@ def get_base_registry(self) -> str:
         # TODO CLOUDP-335471: STAGING scenario should also push to STAGING_REPO_URL with version_id tag,
         #                     in addition to the current ECR dev latest push (for backward compatibility)
         #                     This will enable proper staging environment testing before production releases
-        
+
         # For now, always use BASE_REPO_URL to preserve legacy behavior
         # (STAGING pushes to ECR dev with "latest" tag)
         return os.environ.get("BASE_REPO_URL")
diff --git a/scripts/release/build_images.py b/scripts/release/build_images.py
@@ -10,6 +10,8 @@
 import docker
 from lib.base_logger import logger
 
+DEFAULT_BUILDER_NAME = "multiarch"  # Default buildx builder name
+
 
 def ecr_login_boto3(region: str, account_id: str):
     """
@@ -38,7 +40,7 @@ def ecr_login_boto3(region: str, account_id: str):
     logger.debug(f"ECR login succeeded: {status}")
 
 
-def ensure_buildx_builder(builder_name: str = "multiarch") -> str:
+def ensure_buildx_builder(builder_name: str = DEFAULT_BUILDER_NAME) -> str:
     """
     Ensures a Docker Buildx builder exists for multi-platform builds.
 
@@ -70,7 +72,13 @@ def ensure_buildx_builder(builder_name: str = "multiarch") -> str:
 
 
 def execute_docker_build(
-    tag: str, dockerfile: str, path: str, args: Dict[str, str] = {}, push: bool = True, platforms: list[str] = None
+    tag: str,
+    dockerfile: str,
+    path: str,
+    args: Dict[str, str] = {},
+    push: bool = True,
+    platforms: list[str] = None,
+    builder_name: str = DEFAULT_BUILDER_NAME,
 ):
     """
     Build a Docker image using python_on_whales and Docker Buildx for multi-architecture support.
@@ -105,10 +113,7 @@ def execute_docker_build(
         if len(platforms) > 1:
             logger.info(f"Multi-platform build for {len(platforms)} architectures")
 
-        # We need a special driver to handle multi-platform builds
-        builder_name = ensure_buildx_builder("multiarch")
-
-        # Build the image using buildx
+        # Build the image using buildx, builder must be already initialized
         docker.buildx.build(
             context_path=path,
             file=dockerfile,
diff --git a/scripts/release/pipeline_main.py b/scripts/release/pipeline_main.py
@@ -34,6 +34,7 @@
     BuildContext,
     BuildScenario,
 )
+from scripts.release.build_images import DEFAULT_BUILDER_NAME, ensure_buildx_builder
 
 """
 The goal of main.py, build_configuration.py and build_context.py is to provide a single source of truth for the build
@@ -145,6 +146,10 @@ def main():
     logger.info(f"Building image: {args.image}")
     logger.info(f"Build configuration: {build_config}")
 
+    # Create buildx builder
+    # It must be initialized here as opposed to in build_images.py so that parallel calls (such as agent builds) can access it
+    # and not face race conditions
+    ensure_buildx_builder(DEFAULT_BUILDER_NAME)
     build_image(args.image, build_config)
 
 
