hafnia 0.1.26__py3-none-any.whl → 0.1.27__py3-none-any.whl

hafnia/platform/builder.py

@@ -1,7 +1,7 @@
 import json
 import os
+import re
 import subprocess
-import tempfile
 import zipfile
 from hashlib import sha256
 from pathlib import Path
@@ -58,7 +58,7 @@ def buildx_available() -> bool:
         return False
 
 
-def build_dockerfile(dockerfile: str, docker_context: str, docker_tag: str, meta_file: str) -> None:
+def build_dockerfile(dockerfile: str, docker_context: str, docker_tag: str) -> None:
     """
     Build a Docker image using the provided Dockerfile.
 
@@ -73,12 +73,12 @@ def build_dockerfile(dockerfile: str, docker_context: str, docker_tag: str, meta
 
     cmd = ["docker", "build", "--platform", "linux/amd64", "-t", docker_tag, "-f", dockerfile]
 
-    remote_cache = os.getenv("REMOTE_CACHE_REPO")
+    remote_cache = os.getenv("EXPERIMENT_CACHE_ECR")
     cloud_mode = os.getenv("HAFNIA_CLOUD", "false").lower() in ["true", "1", "yes"]
 
     if buildx_available():
         cmd.insert(1, "buildx")
-        cmd += ["--build-arg", "BUILDKIT_INLINE_CACHE=1", "--metadata-file", meta_file]
+        cmd += ["--build-arg", "BUILDKIT_INLINE_CACHE=1"]
         if cloud_mode:
             cmd += ["--push"]
         if remote_cache:
@@ -91,11 +91,27 @@ def build_dockerfile(dockerfile: str, docker_context: str, docker_tag: str, meta
     cmd.append(docker_context)
     sys_logger.debug("Build cmd: `{}`".format(" ".join(cmd)))
     sys_logger.info(f"Building and pushing Docker image with BuildKit (buildx); cache repo: {remote_cache or 'none'}")
+    result = None
+    output = ""
+    errors = []
     try:
-        subprocess.run(cmd, check=True)
+        result = subprocess.run(cmd, check=True, capture_output=True, text=True)
+        output = (result.stdout or "") + (result.stderr or "")
     except subprocess.CalledProcessError as e:
-        sys_logger.error(f"Docker build failed: {e}")
-        raise RuntimeError(f"Docker build failed: {e}")
+        output = (e.stdout or "") + (e.stderr or "")
+        error_pattern = r"ERROR: (.+?)(?:\n|$)"
+        errors = re.findall(error_pattern, output)
+        if not errors:
+            raise RuntimeError(f"Docker build failed: {output}")
+        if re.search(r"image tag '([^']+)' already exists", errors[-1]):
+            sys_logger.warning("Image {} already exists in the registry.".format(docker_tag.rsplit("/")[-1]))
+            return
+        raise RuntimeError(f"Docker build failed: {output}")
+    finally:
+        stage_pattern = r"^.*\[\d+/\d+\][^\n]*"
+        stages = re.findall(stage_pattern, output, re.MULTILINE)
+        user_logger.info("\n".join(stages))
+        sys_logger.debug(output)
 
 
 def check_registry(docker_image: str) -> Optional[str]:
@@ -127,18 +143,8 @@ def build_image(metadata: Dict, registry_repo: str, state_file: str = "state.jso
     docker_image = f"{registry_repo}:{metadata['digest']}"
     image_exists = check_registry(docker_image) is not None
     if image_exists:
-        sys_logger.info(f"Tag already in ECR – skipping build of {docker_image}.")
+        sys_logger.info("Image {} already exists in the registry.".format(docker_image.rsplit("/")[-1]))
     else:
-        with tempfile.NamedTemporaryFile() as meta_tmp:
-            meta_file = meta_tmp.name
-            build_dockerfile(
-                metadata["dockerfile"], Path(metadata["dockerfile"]).parent.as_posix(), docker_image, meta_file
-            )
-            with open(meta_file) as m:
-                try:
-                    build_meta = json.load(m)
-                    metadata["local_digest"] = build_meta["containerimage.digest"]
-                except Exception:
-                    metadata["local_digest"] = ""
+        build_dockerfile(metadata["dockerfile"], Path(metadata["dockerfile"]).parent.as_posix(), docker_image)
     metadata.update({"image_tag": docker_image, "image_exists": image_exists})
     Path(state_file).write_text(json.dumps(metadata, indent=2))

{hafnia-0.1.26.dist-info → hafnia-0.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hafnia
-Version: 0.1.26
+Version: 0.1.27
 Summary: Python SDK for communication with Hafnia platform.
 Author-email: Milestone Systems <hafniaplatform@milestone.dk>
 License-File: LICENSE

{hafnia-0.1.26.dist-info → hafnia-0.1.27.dist-info}/RECORD

@@ -17,11 +17,11 @@ hafnia/data/factory.py,sha256=4fZDkWNyOK1QNCmsxsXfSztPJkJW_HBIa_PTdGCYHCM,2551
 hafnia/experiment/__init__.py,sha256=OEFE6HqhO5zcTCLZcPcPVjIg7wMFFnvZ1uOtAVhRz7M,85
 hafnia/experiment/hafnia_logger.py,sha256=usL5pl7XLJP-g1vZrwvbky5YiD6Bg-rOODYYAX5z43I,6830
 hafnia/platform/__init__.py,sha256=I-VIVXDxwBAUzxx8Zx0g_wykyDdFGTsjb_mYLmvxk2Y,443
-hafnia/platform/builder.py,sha256=OFPnOjE3bAbWjUgYErXtffDKTiW_9ol95eVzKqL27WM,5433
+hafnia/platform/builder.py,sha256=_g8ykQWETz5Y4Np9QU1a6wIzbbJwXCkbiOCA6JcF5Rc,5742
 hafnia/platform/download.py,sha256=t055axPNHlXTYCQgZHOS2YMQt1I2_bc4G8dltsOKttY,4760
 hafnia/platform/experiment.py,sha256=-nAfTmn1c8sE6pHDCTNZvWDTopkXndarJAPIGvsnk60,2389
-hafnia-0.1.26.dist-info/METADATA,sha256=Lds8gx_ffd8_l9kByvK_e-HPFehSSUv8E_85d8ZelSE,14990
-hafnia-0.1.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hafnia-0.1.26.dist-info/entry_points.txt,sha256=FCJVIQ8GP2VE9I3eeGVF5eLxVDNW_01pOJCpG_CGnMM,45
-hafnia-0.1.26.dist-info/licenses/LICENSE,sha256=wLZw1B7_mod_CO1H8LXqQgfqlWD6QceJR8--LJYRZGE,1078
-hafnia-0.1.26.dist-info/RECORD,,
+hafnia-0.1.27.dist-info/METADATA,sha256=zClGBhUHMs5pW19BX5avM5tBWvF5KAQxmAvEwRKNeSw,14990
+hafnia-0.1.27.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hafnia-0.1.27.dist-info/entry_points.txt,sha256=FCJVIQ8GP2VE9I3eeGVF5eLxVDNW_01pOJCpG_CGnMM,45
+hafnia-0.1.27.dist-info/licenses/LICENSE,sha256=wLZw1B7_mod_CO1H8LXqQgfqlWD6QceJR8--LJYRZGE,1078
+hafnia-0.1.27.dist-info/RECORD,,