Lindt

Author: Julien-Ben

scripts/release/build_context.py

@@ -29,7 +29,9 @@ def infer_scenario_from_environment(cls) -> "BuildScenario":
             scenario = BuildScenario.PATCH
             logger.info(f"Build scenario: {scenario} (patch_id: {patch_id})")
         elif is_evg:
-            scenario = BuildScenario.MASTER  # TODO: ultimately we won't have RELEASE variant and master will push to staging
+            scenario = (
+                BuildScenario.MASTER
+            )  # TODO: ultimately we won't have RELEASE variant and master will push to staging
             logger.info(f"Build scenario: {scenario} (patch_id: {patch_id})")
         else:
             scenario = BuildScenario.DEVELOPMENT
@@ -55,27 +57,26 @@ def from_scenario(cls, scenario: BuildScenario) -> "BuildContext":
         git_tag = os.getenv("triggered_by_git_tag")
         patch_id = os.getenv("version_id")
         signing_enabled = scenario == BuildScenario.RELEASE
-        
+
         return cls(
             scenario=scenario,
             git_tag=git_tag,
             patch_id=patch_id,
             signing_enabled=signing_enabled,
-            version=git_tag or patch_id, #TODO: update this
+            version=git_tag or patch_id,  # TODO: update this
         )
-    
+
     def get_version(self) -> str:
         """Gets the version that will be used to tag the images."""
         if self.scenario == BuildScenario.RELEASE:
             return self.git_tag
         if self.patch_id:
             return self.patch_id
         return "latest"
-    
+
     def get_base_registry(self) -> str:
         """Get the base registry URL for the current scenario."""
         if self.scenario == BuildScenario.RELEASE:
             return os.environ.get("STAGING_REPO_URL")
         else:
             return os.environ.get("BASE_REPO_URL")
-

scripts/release/build_images.py

@@ -15,6 +15,7 @@
 from lib.sonar.sonar import create_ecr_repository
 from scripts.evergreen.release.images_signing import sign_image, verify_signature
 
+
 # TODO: self review the PR
 def ecr_login_boto3(region: str, account_id: str):
     """
@@ -45,36 +46,38 @@ def ecr_login_boto3(region: str, account_id: str):
 
 # TODO: don't do it every time ? Check for existence without relying on Exception
 def ensure_buildx_builder(builder_name: str = "multiarch") -> str:
-      """
-      Ensures a Docker Buildx builder exists for multi-platform builds.
-      
-      :param builder_name: Name for the buildx builder
-      :return: The builder name that was created or reused
-      """
-      docker = python_on_whales.docker
-
-      try:
-          docker.buildx.create(
-              name=builder_name,
-              driver="docker-container",
-              use=True,
-              bootstrap=True,
-          )
-          logger.info(f"Created new buildx builder: {builder_name}")
-      except DockerException as e:
-          if f'existing instance for "{builder_name}"' in str(e):
-              logger.info(f"Builder '{builder_name}' already exists – reusing it.")
-              # Make sure it's the current one:
-              docker.buildx.use(builder_name)
-          else:
-              # Some other failure happened
-              logger.error(f"Failed to create buildx builder: {e}")
-              raise
-
-      return builder_name
-
-
-def build_image(tag: str, dockerfile: str, path: str, args: Dict[str, str] = {}, push: bool = True, platforms: list[str] = None):
+    """
+    Ensures a Docker Buildx builder exists for multi-platform builds.
+
+    :param builder_name: Name for the buildx builder
+    :return: The builder name that was created or reused
+    """
+    docker = python_on_whales.docker
+
+    try:
+        docker.buildx.create(
+            name=builder_name,
+            driver="docker-container",
+            use=True,
+            bootstrap=True,
+        )
+        logger.info(f"Created new buildx builder: {builder_name}")
+    except DockerException as e:
+        if f'existing instance for "{builder_name}"' in str(e):
+            logger.info(f"Builder '{builder_name}' already exists – reusing it.")
+            # Make sure it's the current one:
+            docker.buildx.use(builder_name)
+        else:
+            # Some other failure happened
+            logger.error(f"Failed to create buildx builder: {e}")
+            raise
+
+    return builder_name
+
+
+def build_image(
+    tag: str, dockerfile: str, path: str, args: Dict[str, str] = {}, push: bool = True, platforms: list[str] = None
+):
     """
     Build a Docker image using python_on_whales and Docker Buildx for multi-architecture support.
 
@@ -86,25 +89,25 @@ def build_image(tag: str, dockerfile: str, path: str, args: Dict[str, str] = {},
     :param platforms: List of target platforms (e.g., ["linux/amd64", "linux/arm64"])
     """
     docker = python_on_whales.docker
-    
+
     try:
         # Convert build args to the format expected by python_on_whales
         build_args = {k: str(v) for k, v in args.items()} if args else {}
-        
+
         # Set default platforms if not specified
         if platforms is None:
             platforms = ["linux/amd64"]
-        
+
         logger.info(f"Building image: {tag}")
         logger.info(f"Platforms: {platforms}")
         logger.info(f"Dockerfile: {dockerfile}")
         logger.info(f"Build context: {path}")
         logger.debug(f"Build args: {build_args}")
-        
+
         # Use buildx for multi-platform builds
         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")
 
@@ -117,18 +120,17 @@ def build_image(tag: str, dockerfile: str, path: str, args: Dict[str, str] = {},
             builder=builder_name,
             build_args=build_args,
             push=push,
-            provenance=False, # To not get an untagged image for single platform builds
+            provenance=False,  # To not get an untagged image for single platform builds
             pull=False,  # Don't always pull base images
         )
-        
+
         logger.info(f"Successfully built {'and pushed' if push else ''} {tag}")
-        
+
     except Exception as e:
         logger.error(f"Failed to build image {tag}: {e}")
         raise RuntimeError(f"Failed to build image {tag}: {str(e)}")
 
 
-
 def process_image(
     image_name: str,
     image_tag: str,
@@ -141,7 +143,7 @@ def process_image(
     push: bool = True,
 ):
     # Login to ECR using boto3
-    ecr_login_boto3(region="us-east-1", account_id="268558157000") # TODO: use environment variables
+    ecr_login_boto3(region="us-east-1", account_id="268558157000")  # TODO: use environment variables
 
     # Helper to automatically create registry with correct name
     should_create_repo = False
@@ -157,15 +159,15 @@ def process_image(
 
     docker_registry = f"{base_registry}/{image_name}"
     image_full_uri = f"{docker_registry}:{image_tag}"
-    
+
     # Build image with docker buildx
     build_image(
         tag=image_full_uri,
         dockerfile=dockerfile_path,
         path=build_path,
         args=dockerfile_args,
         push=push,
-        platforms=platforms
+        platforms=platforms,
     )
 
     if sign:

scripts/release/main.py

@@ -115,7 +115,7 @@ def main():
 
     _setup_tracing()
     parser = argparse.ArgumentParser(description="Build container images.")
-    parser.add_argument("image", help="Image to build.") # Required
+    parser.add_argument("image", help="Image to build.")  # Required
     parser.add_argument("--parallel", action="store_true", help="Build images in parallel.")
     parser.add_argument("--debug", action="store_true", help="Enable debug logging.")
     parser.add_argument("--sign", action="store_true", help="Sign images.")
@@ -138,7 +138,7 @@ def main():
         "--registry",
         help="Override the base registry instead of resolving from build scenario",
     )
-    
+
     # Agent specific arguments
     parser.add_argument(
         "--all-agents",
@@ -172,7 +172,9 @@ def build_config_from_args(args):
     platforms = [p.strip() for p in args.platform.split(",")]
     SUPPORTED_PLATFORMS = ["linux/amd64", "linux/arm64"]
     if any(p not in SUPPORTED_PLATFORMS for p in platforms):
-        logger.error(f"Unsupported platform in '{args.platform}'. Supported platforms: {', '.join(SUPPORTED_PLATFORMS)}")
+        logger.error(
+            f"Unsupported platform in '{args.platform}'. Supported platforms: {', '.join(SUPPORTED_PLATFORMS)}"
+        )
         sys.exit(1)
 
     # Centralized configuration management with overrides
@@ -191,7 +193,7 @@ def build_config_from_args(args):
         version=version,
         base_registry=registry,
         parallel=args.parallel,
-        debug=args.debug, # TODO: is debug used ?
+        debug=args.debug,  # TODO: is debug used ?
         platforms=platforms,
         sign=sign,
         all_agents=all_agents,