Merge pull request #34008 from def-/pr-mz-ghcr-1

mzcompose: Default to using GHCR mirror

Author: def-

bin/ci-builder

@@ -167,7 +167,7 @@ print(hash.decode())
 cache_tag=cache-$flavor-$rust_version-$arch_go
 
 image_registry="materialize"
-if is_truthy "${CI:-0}" || is_truthy "${MZ_GHCR:-0}"; then
+if is_truthy "${CI:-0}" || is_truthy "${MZ_GHCR:-1}"; then
     image_registry="ghcr.io/materializeinc/materialize"
 fi
 

misc/python/materialize/cli/mzcompose.py

@@ -411,6 +411,10 @@ def run(self, args: argparse.Namespace) -> None:
         composition.default_port(args.service)
 
         image = service["image"].rsplit(":", 1)[0]
+        ghcr_prefix = "ghcr.io/materializeinc/"
+        if image.startswith(ghcr_prefix):
+            image.removeprefix(ghcr_prefix)
+
         if image == "materialize/materialized":
             deps = composition.repo.resolve_dependencies(
                 [composition.repo.images["psql"]]

misc/python/materialize/mzbuild.py

@@ -1183,7 +1183,7 @@ def __init__(
         sanitizer: Sanitizer = Sanitizer.none,
         image_registry: str = (
             "ghcr.io/materializeinc/materialize"
-            if ui.env_is_truthy("CI") or ui.env_is_truthy("MZ_GHCR")
+            if ui.env_is_truthy("CI") or ui.env_is_truthy("MZ_GHCR", "1")
             else "materialize"
         ),
         image_prefix: str = "",
@@ -1289,7 +1289,7 @@ def install_arguments(parser: argparse.ArgumentParser) -> None:
             "--image-registry",
             default=(
                 "ghcr.io/materializeinc/materialize"
-                if ui.env_is_truthy("CI") or ui.env_is_truthy("MZ_GHCR")
+                if ui.env_is_truthy("CI") or ui.env_is_truthy("MZ_GHCR", "1")
                 else "materialize"
             ),
             help="the Docker image registry to pull images from and push images to",