Cleanup ensure

Julien-Ben · Julien-Ben · commit c6fc163b0003 · 2025-08-08T13:09:30.000+02:00
diff --git a/scripts/release/build_images.py b/scripts/release/build_images.py
@@ -1,5 +1,8 @@
 # This file is the new Sonar
 import base64
+import fcntl
+import os
+import time
 from typing import Dict
 
 import boto3
@@ -123,7 +126,10 @@ def execute_docker_build(
         if len(platforms) > 1:
             logger.info(f"Multi-platform build for {len(platforms)} architectures")
 
-        # Build the image using buildx, builder must be already initialized
+        # Ensure buildx builder exists (safe for concurrent execution)
+        ensure_buildx_builder(builder_name)
+
+        # Build the image using buildx
         docker.buildx.build(
             context_path=path,
             file=dockerfile,
diff --git a/scripts/release/pipeline_main.py b/scripts/release/pipeline_main.py
@@ -34,7 +34,6 @@
     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
@@ -146,10 +145,6 @@ 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)
 
 
