Use a separate push-cache flag for bakery build

Author: bschwedler

posit-bakery/posit_bakery/cli/build.py

@@ -80,6 +80,13 @@ def build(
             rich_help_panel=RichHelpPanelEnum.BUILD_CONFIGURATION_AND_OUTPUTS,
         ),
     ] = False,
+    push_cache: Annotated[
+        Optional[bool],
+        typer.Option(
+            help="Push the build cache to the cache registry without pushing the image.",
+            rich_help_panel=RichHelpPanelEnum.BUILD_CONFIGURATION_AND_OUTPUTS,
+        ),
+    ] = False,
     clean: Annotated[
         Optional[bool],
         typer.Option(
@@ -205,6 +212,7 @@ def build(
         config.build_targets(
             load=load,
             push=push,
+            push_cache=push_cache,
             cache=cache,
             platforms=image_platform,
             strategy=strategy,

posit-bakery/posit_bakery/config/config.py

@@ -734,6 +734,7 @@ def build_targets(
         self,
         load: bool = True,
         push: bool = False,
+        push_cache: bool = False,
         cache: bool = True,
         platforms: list[str] | None = None,
         strategy: ImageBuildStrategy = ImageBuildStrategy.BAKE,
@@ -744,6 +745,7 @@ def build_targets(
 
         :param load: If True, load the built images into the local Docker daemon.
         :param push: If True, push the built images to the configured registries.
+        :param push_cache: If True, push the build cache to the cache registry without pushing images.
         :param cache: If True, use the build cache when building images.
         :param platforms: Optional list of platforms to build for. If None, builds for the configuration specified
             platform.
@@ -752,7 +754,9 @@ def build_targets(
         :param fail_fast: If True, stop building targets on the first failure.
         """
         if strategy == ImageBuildStrategy.BAKE:
-            bake_plan = BakePlan.from_image_targets(context=self.base_path, image_targets=self.targets, push=push)
+            bake_plan = BakePlan.from_image_targets(
+                context=self.base_path, image_targets=self.targets, push_cache=push_cache
+            )
             set_opts = None
             if self.settings.temp_registry is not None and push:
                 set_opts = {

posit-bakery/posit_bakery/image/bake/bake.py

@@ -90,7 +90,7 @@ def serialize_path(value: Path | str) -> str:
         return str(value)
 
     @classmethod
-    def from_image_target(cls, image_target: ImageTarget, push: bool = False) -> "BakeTarget":
+    def from_image_target(cls, image_target: ImageTarget, push_cache: bool = False) -> "BakeTarget":
         """Create a BakeTarget from an ImageTarget."""
         kwargs = {"tags": image_target.tags}
         platforms = image_target.image_os.platforms if image_target.image_os is not None else DEFAULT_PLATFORMS
@@ -101,7 +101,7 @@ def from_image_target(cls, image_target: ImageTarget, push: bool = False) -> "Ba
             platform_suffix = "-".join(p.removeprefix("linux/").replace("/", "-") for p in platforms)
             cache_name = f"{cache_name}-{platform_suffix}"
             kwargs["cache_from"] = [{"type": "registry", "ref": cache_name}]
-            if push:
+            if push_cache:
                 kwargs["cache_to"] = [{"type": "registry", "ref": cache_name, "mode": "max"}]
 
         if image_target.temp_name is not None:
@@ -158,12 +158,14 @@ def update_groups(
         return groups
 
     @classmethod
-    def from_image_targets(cls, context: Path, image_targets: list[ImageTarget], push: bool = False) -> "BakePlan":
+    def from_image_targets(
+        cls, context: Path, image_targets: list[ImageTarget], push_cache: bool = False
+    ) -> "BakePlan":
         """Create a BakePlan from a list of ImageTarget objects.
 
         :param context: The absolute path to the build context directory.
         :param image_targets: A list of ImageTarget objects to include in the bake plan.
-        :param push: Whether images will be pushed. Controls cache_to behavior.
+        :param push_cache: Whether to push build cache to the cache registry.
 
         :return: A BakePlan object containing the context, groups, and targets.
         """
@@ -173,7 +175,7 @@ def from_image_targets(cls, context: Path, image_targets: list[ImageTarget], pus
         targets: dict[str, BakeTarget] = {}
 
         for image_target in image_targets:
-            bake_target = BakeTarget.from_image_target(image_target=image_target, push=push)
+            bake_target = BakeTarget.from_image_target(image_target=image_target, push_cache=push_cache)
             groups = cls.update_groups(
                 groups=groups,
                 uid=image_target.uid,

posit-bakery/test/image/bake/testdata/cache_registry/barebones_plan.json

@@ -40,14 +40,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/scratch/cache:1.0.0-scratch"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/scratch/cache:1.0.0-scratch",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/scratch/cache:1.0.0-scratch-amd64"
         }
       ]
     }

posit-bakery/test/image/bake/testdata/cache_registry/basic_plan.json

@@ -58,14 +58,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-min"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-min",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-min-amd64"
         }
       ]
     },
@@ -111,14 +104,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-std"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-std",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-image/cache:1.0.0-ubuntu-22.04-std-amd64"
         }
       ]
     }

posit-bakery/test/image/bake/testdata/cache_registry/multiplatform_plan.json

@@ -58,14 +58,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-min"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-min",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-min-amd64"
         }
       ]
     },
@@ -100,14 +93,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-min"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-min",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-min-amd64-arm64"
         }
       ]
     },
@@ -141,14 +127,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-std"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-std",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-22.04-std-amd64"
         }
       ]
     },
@@ -187,14 +166,7 @@
       "cache_from": [
         {
           "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-std"
-        }
-      ],
-      "cache_to": [
-        {
-          "type": "registry",
-          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-std",
-          "mode": "max"
+          "ref": "ghcr.io/posit-dev/test-multi/cache:1.0.0-ubuntu-24.04-std-amd64-arm64"
         }
       ]
     }