docker-devkit 0.2.0.dev37277620738__py3-none-any.whl → 0.2.1.dev109__py3-none-any.whl

docker_devkit/build_docker.py

@@ -6,11 +6,13 @@ import platform
 import re
 from pathlib import Path
 from subprocess import CalledProcessError
-from typing import Annotated, Any, Literal
+from tempfile import TemporaryDirectory
+from typing import Annotated, Any, Literal, TypedDict
 
 import typer
 from bashrun.bash import bash, bash_output
 from ci_devkit.builds import push_build
+from ci_devkit.setup_oras import install_oras
 from .detect_gpu import GPU_TYPES, Gpu, detect_gpu
 from .documents import BakeDocument, digest_pinned, parse_bake
 from pydantic_settings import BaseSettings
@@ -32,7 +34,16 @@ METADATA_PATH = Path("metadata.json")
 
 Mode = Literal["local", "ci"]
 
-IMAGES_LOCK_PLATFORM = "images-lock"
+DIGEST_PROJECT = "images-digests"
+DIGEST_PLATFORM = "all"
+DIGEST_FILE_NAME = "images-digests.json"
+
+
+class DigestEntry(TypedDict):
+    ref: str
+    digest: str
+    tags: list[str]
+
 
 app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
@@ -53,17 +64,6 @@ def build(
         list[str] | None,
         typer.Option("--targets", "-t", help="Build only these services (from the image manifest)."),
     ] = None,
-    builds_registry: Annotated[
-        str | None,
-        typer.Option("--builds-registry", help="OCI registry path to push the resolved lock to (CI build artifacts)."),
-    ] = None,
-    lock_project: Annotated[
-        str | None,
-        typer.Option("--lock-project", help="Project component of the lock's builds-shelf address (CI only)."),
-    ] = None,
-    run_number: Annotated[
-        int, typer.Option("--run-number", help="CI run number baked into the lock's builds-shelf tag.")
-    ] = 0,
 ) -> None:
     run_build(
         upgrade=upgrade,
@@ -73,9 +73,6 @@ def build(
         gpu_only=gpu_only,
         no_cache=no_cache,
         targets_opt=targets_opt,
-        builds_registry=builds_registry,
-        lock_project=lock_project,
-        run_number=run_number,
     )
 
 
@@ -89,9 +86,6 @@ def run_build(
     no_cache: bool = False,
     targets_opt: list[str] | None = None,
     env_overlay: dict[str, str] | None = None,
-    builds_registry: str | None = None,
-    lock_project: str | None = None,
-    run_number: int = 0,
 ) -> None:
     root = Path.cwd()
     manifest = require_manifest(root)
@@ -223,22 +217,56 @@ def run_build(
     if not set(targets) <= baked_images.keys():
         raise RuntimeError("Bake output does not cover the requested targets")
 
-    push_images_lock(builds_registry, lock_project, run_number, lock_file)
-
-
-def push_images_lock(builds_registry: str | None, lock_project: str | None, run_number: int, lock_file: Path) -> None:
-    if builds_registry is None:
-        return
-    if not lock_project or run_number <= 0:
-        raise typer.BadParameter("--builds-registry requires --lock-project and a positive --run-number")
-    push_build(
-        builds_registry,
-        lock_project,
-        IMAGES_LOCK_PLATFORM,
-        f"run-{run_number}",
-        lock_file.parent,
-        [lock_file.name],
-    )
+    # Push the digest manifest to the repo's builds shelf (address and SHA derived, never flagged)
+    if mode == "ci":
+        github_repository = os.environ.get("GITHUB_REPOSITORY", "")
+        if not github_repository:
+            raise SystemExit("GITHUB_REPOSITORY not set — ci mode reads the GitHub runner environment")
+        shelf = f"ghcr.io/{github_repository}/builds"
+        sha = bash_output("git rev-parse HEAD").strip()
+        push_image_digests(shelf, sha, baked_images, targets)
+
+
+def push_image_digests(
+    shelf: str,
+    sha: str,
+    baked_images: dict[str, Any],
+    targets: list[str],
+) -> None:
+    install_oras()
+    manifest = distill_digest_manifest(baked_images, targets)
+    with TemporaryDirectory(prefix="digest-manifest-") as staging:
+        manifest_path = Path(staging) / DIGEST_FILE_NAME
+        manifest_path.write_text(json.dumps(manifest, indent=2), encoding="utf-8")
+        push_build(
+            shelf,
+            DIGEST_PROJECT,
+            DIGEST_PLATFORM,
+            f"sha-{sha}",
+            Path(staging),
+            [DIGEST_FILE_NAME],
+        )
+
+
+def distill_digest_manifest(baked_images: dict[str, Any], targets: list[str]) -> dict[str, DigestEntry]:
+    manifest: dict[str, DigestEntry] = {}
+    for target in targets:
+        entry = baked_images[target]
+        image_name = entry["image.name"]
+        digest = entry["containerimage.digest"]
+        refs = [reference.strip() for reference in image_name.split(",") if reference.strip()]
+        image_ref = ""
+        tags: list[str] = []
+        for reference in refs:
+            reference = reference.split("@", 1)[0]
+            repository, separator, tag = reference.rpartition(":")
+            if separator:
+                image_ref = repository
+                tags.append(tag)
+        if not tags:
+            raise ValueError(f"target '{target}' produced no tagged image references from '{image_name}'")
+        manifest[target] = {"ref": image_ref, "digest": digest, "tags": tags}
+    return manifest
 
 
 # Vibe code - Gemini 3

{docker_devkit-0.2.0.dev37277620738.dist-info → docker_devkit-0.2.1.dev109.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.5
 Name: docker-devkit
-Version: 0.2.0.dev37277620738
+Version: 0.2.1.dev109
 Summary: Docker-stack lifecycle commands (up/down/build) driven by a pyproject-declared compose assembly
 License-File: LICENSE
 License-File: NOTICE
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0
-Requires-Dist: ci-devkit==0.1.15.dev36756330648
+Requires-Dist: ci-devkit>=0.1.15
 Requires-Dist: packaging>=24.1
 Requires-Dist: pathspec>=1.0.4
 Requires-Dist: pydantic-settings>=2.9.1

{docker_devkit-0.2.0.dev37277620738.dist-info → docker_devkit-0.2.1.dev109.dist-info}/RECORD

@@ -1,5 +1,5 @@
 docker_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-docker_devkit/build_docker.py,sha256=g6KPTOp5TDyG550Zun_XNpWH2D19arh-PaAjgBoSyhU,11685
+docker_devkit/build_docker.py,sha256=i4uSR7OLflqspfbIlaYnfD6M7VlrRoKBW-8Jgc-D9MQ,12667
 docker_devkit/config.py,sha256=UMAS6yF1E9PIbsRs2TVig9XwSNCvQe5w9eTLUHOPKq0,3112
 docker_devkit/context_sha.py,sha256=lhCxUcYM98xCdDum3hsFRFw5WYrjvZUSMbOu_7ZmQjE,3041
 docker_devkit/detect_gpu.py,sha256=C4e3vixvSSJS6xQiMVWp2IdWSAgMr551KrBTuIrkTk4,456
@@ -13,9 +13,9 @@ docker_devkit/modes.py,sha256=Lwhblzu5Kn7qhfy_QMqE28XuflSIJtCRBYNX7Iq8Qfo,1510
 docker_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docker_devkit/score_generate.py,sha256=psbQm-MWf9A5YP0ov0rLPUiuVAQbUWn6yfUmB-CXurU,9434
 docker_devkit/up.py,sha256=32A2_6mxAF00XILecxYTzCQw0QvSjevBWCnayF5X1Xs,4284
-docker_devkit-0.2.0.dev37277620738.dist-info/METADATA,sha256=58BItOxc6Me7YTdcb9SeFGSi5BNxEuLKvu9bJiH-XLU,545
-docker_devkit-0.2.0.dev37277620738.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-docker_devkit-0.2.0.dev37277620738.dist-info/entry_points.txt,sha256=6cAHqlMvuXI00uTJLf73MTqWnLd1-m5sDgJrSyHWv4U,244
-docker_devkit-0.2.0.dev37277620738.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
-docker_devkit-0.2.0.dev37277620738.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
-docker_devkit-0.2.0.dev37277620738.dist-info/RECORD,,
+docker_devkit-0.2.1.dev109.dist-info/METADATA,sha256=J8rxb9gnmPD8hwmr_kDMfDUxzd3UYKR7Vg-Bg1kGVMU,522
+docker_devkit-0.2.1.dev109.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+docker_devkit-0.2.1.dev109.dist-info/entry_points.txt,sha256=6cAHqlMvuXI00uTJLf73MTqWnLd1-m5sDgJrSyHWv4U,244
+docker_devkit-0.2.1.dev109.dist-info/licenses/LICENSE,sha256=RFhQPdSOiMTguUX7JSoIuTxA7HVzCbj_p8WU36HjUQQ,10947
+docker_devkit-0.2.1.dev109.dist-info/licenses/NOTICE,sha256=jvglZza3GCdN7v4_TLuXUqX9C_uABlwAKUkcIeKwk_8,26
+docker_devkit-0.2.1.dev109.dist-info/RECORD,,