funcd-bundle 0.7.0__tar.gz → 0.8.1__tar.gz

{funcd_bundle-0.7.0 → funcd_bundle-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: funcd-bundle
-Version: 0.7.0
+Version: 0.8.1
 Summary: Bundle a Python funcd function and its locked dependencies for the funcd runtime
 Project-URL: Homepage, https://github.com/pyvvo/funcd-python
 Project-URL: Repository, https://github.com/pyvvo/funcd-python

{funcd_bundle-0.7.0 → funcd_bundle-0.8.1}/pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "funcd-bundle"
 # Not bumped per release: the vX.Y.Z git tag is the version, stamped into the build at publish time.
-version = "0.7.0"
+version = "0.8.1"
 description = "Bundle a Python funcd function and its locked dependencies for the funcd runtime"
 authors = [{ name = "The funcd Authors" }]
 readme = "README.md"

{funcd_bundle-0.7.0 → funcd_bundle-0.8.1}/src/funcd_bundle/bundle.py

@@ -28,6 +28,13 @@ from pathlib import Path
 import yaml
 
 BASE_IMAGE = "python:3.14-slim-bookworm"
+# BASE_IMAGE pinned per platform (its index is sha256:48b13b00…0f83), so a bundle builds from one image on
+# every machine. Not the index digest: the classic image store maps one digest to one image, so it cannot hold
+# both platforms of an index under one digest. Move the three together.
+BASE_IMAGES = {
+    "linux/amd64": "python@sha256:a66d3a463d0be3cc537c269b0d3418746dda512417a975559a0eaa8a6406baaf",
+    "linux/arm64": "python@sha256:0e24db28cf5b7788413afe3fdc63075ca22bc4ecf74f5472304b391c2110e629",
+}
 PYTHON_VERSION = "3.14"
 GLIBC = "2_36"
 MANIFEST_SUFFIX = ".funcdctl.yaml"
@@ -286,7 +293,11 @@ def _check(out: Path, platform: str, modules: list[str]) -> None:
 
 
 def _create(platform: str, env: list[str], command: list[str]) -> str:
-    return _run(["docker", "create", "--platform", platform, *env, BASE_IMAGE, *command]).decode().strip()
+    return (
+        _run(["docker", "create", "--platform", platform, *env, BASE_IMAGES[platform], *command])
+        .decode()
+        .strip()
+    )
 
 
 def _start(cid: str, what: str) -> None:

{funcd_bundle-0.7.0 → funcd_bundle-0.8.1}/tests/test_bundle.py

@@ -19,7 +19,7 @@ import pytest
 import yaml
 
 from funcd_bundle import BundleError, bundle, discover, host_platform
-from funcd_bundle.bundle import _check
+from funcd_bundle.bundle import BASE_IMAGES, PLATFORMS, _check
 from funcd_bundle.cli import main
 
 FOREIGN = {"linux/arm64": "linux/amd64", "linux/amd64": "linux/arm64"}
@@ -362,3 +362,9 @@ def test_issue_r48_invalid_manifest_yaml_is_reported(
     assert err.startswith(f"funcd-bundle: {tmp_path / 'funcdctl.yaml'}: "), err
     assert "while parsing a flow node" in err, "the parser message names the problem"
     assert "Traceback" not in err
+
+
+def test_base_image_is_pinned_by_digest() -> None:
+    assert set(BASE_IMAGES) == set(PLATFORMS), "one pinned image per platform a bundle builds for"
+    for platform, ref in BASE_IMAGES.items():
+        assert re.fullmatch(r"python@sha256:[0-9a-f]{64}", ref), f"{platform}: {ref}"