Remove process_image

Author: Julien-Ben

scripts/release/atomic_pipeline.py

@@ -24,7 +24,7 @@
 
 from .build_configuration import BuildConfiguration
 from .build_context import BuildScenario
-from .build_images import process_image
+from .build_images import build_image
 
 TRACER = trace.get_tracer("evergreen-agent")
 
@@ -233,7 +233,6 @@ def build_image_generic(
 
     registry = build_configuration.base_registry
     args_list = extra_args or {}
-    version = args_list.get("version", "")
 
     # merge in the registry without mutating caller's dict
     build_args = {**args_list, "quay_registry": registry}
@@ -246,20 +245,23 @@ def build_image_generic(
     logger.debug(f"Building {image_name} for platforms={build_configuration.platforms}")
     logger.debug(f"build image generic - registry={registry}")
 
-    process_image(
-        image_name,
-        image_tag=build_configuration.version,
-        dockerfile_path=dockerfile_path,
-        dockerfile_args=build_args,
-        base_registry=build_configuration.base_registry,
+    # Build docker registry URI and call build_image
+    docker_registry = f"{build_configuration.base_registry}/{image_name}"
+    image_full_uri = f"{docker_registry}:{build_configuration.version}"
+
+    build_image(
+        tag=image_full_uri,
+        dockerfile=dockerfile_path,
+        path=build_path,
+        args=build_args,
+        push=True,
         platforms=build_configuration.platforms,
-        sign=build_configuration.sign,
-        build_path=build_path,
     )
 
     if build_configuration.sign:
-        sign_image(registry, version)
-        verify_signature(registry, version)
+        logger.info("Signing image")
+        sign_image(docker_registry, build_configuration.version)
+        verify_signature(docker_registry, build_configuration.version)
 
 
 def build_init_appdb(build_configuration: BuildConfiguration):

scripts/release/build_images.py

@@ -9,7 +9,6 @@
 
 import docker
 from lib.base_logger import logger
-from scripts.evergreen.release.images_signing import sign_image, verify_signature
 
 
 def ecr_login_boto3(region: str, account_id: str):
@@ -83,6 +82,9 @@ def build_image(
     :param push: Whether to push the image after building
     :param platforms: List of target platforms (e.g., ["linux/amd64", "linux/arm64"])
     """
+    # Login to ECR before building
+    ecr_login_boto3(region="us-east-1", account_id="268558157000")
+    
     docker = python_on_whales.docker
 
     try:
@@ -126,34 +128,3 @@ def build_image(
         raise RuntimeError(f"Failed to build image {tag}: {str(e)}")
 
 
-def process_image(
-    image_name: str,
-    image_tag: str,
-    dockerfile_path: str,
-    dockerfile_args: Dict[str, str],
-    base_registry: str,
-    platforms: list[str] = None,
-    sign: bool = False,
-    build_path: str = ".",
-    push: bool = True,
-):
-    # Login to ECR
-    ecr_login_boto3(region="us-east-1", account_id="268558157000")
-
-    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,
-    )
-
-    if sign:
-        logger.info("Signing image")
-        sign_image(docker_registry, image_tag)
-        verify_signature(docker_registry, image_tag)