mzcompose: Also pull from GHCR in CI

Author: def-

bin/ci-builder

@@ -128,7 +128,7 @@ build() {
         --build-arg "RUST_TARGET_FEATURES=$rust_target_features" \
         --build-arg "BAZEL_VERSION=$bazel_version" \
         --tag docker.io/materialize/ci-builder:"$tag" \
-        --tag ghcr.io/materialize/ci-builder:"$tag" \
+        --tag ghcr.io/materializeinc/ci-builder:"$tag" \
         --tag materialize/ci-builder:"$cache_tag" \
         --target $docker_target \
         "$@" ci/builder
@@ -169,20 +169,25 @@ print(hash.decode())
 ')
 cache_tag=cache-$flavor-$rust_version-$arch_go
 
+image_registry="materialize"
+if ui_is_truthy "${CI:-0}"; then
+    image_registry="ghcr.io/materializeinc"
+fi
 
 case "$cmd" in
     build)
         build "$@"
         ;;
     exists)
-        docker manifest inspect materialize/ci-builder:"$tag" &> /dev/null
+        docker manifest inspect "$image_registry"/ci-builder:"$tag" &> /dev/null
         ;;
     tag)
         echo "$tag"
         ;;
     push)
         build "$@"
         docker push materialize/ci-builder:"$tag"
+        docker push ghcr.io/materializeinc/ci-builder:"$tag"
         docker push materialize/ci-builder:"$cache_tag"
         ;;
     run)
@@ -243,6 +248,7 @@ case "$cmd" in
             --env AZURE_SERVICE_ACCOUNT_TENANT
             --env GCP_SERVICE_ACCOUNT_JSON
             --env GITHUB_TOKEN
+            --env GITHUB_GHCR_TOKEN
             --env GPG_KEY
             --env LAUNCHDARKLY_API_TOKEN
             --env LAUNCHDARKLY_SDK_KEY
@@ -392,7 +398,7 @@ case "$cmd" in
             args+=(--volume "$GIT_ROOT_DIR:$GIT_ROOT_DIR")
         fi
         rm -f "$cid_file"
-        docker run "${args[@]}" "materialize/ci-builder:$tag" eatmydata "${docker_command[@]}"
+        docker run "${args[@]}" "$image_registry/ci-builder:$tag" eatmydata "${docker_command[@]}"
         ;;
     root-shell)
         docker exec --interactive --tty --user 0:0 "$(<"$cid_file")" eatmydata ci/builder/root-shell.sh

ci/deploy/docker.py

@@ -37,6 +37,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
         mzbuild.Repository(
             Path("."),
@@ -46,6 +47,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
     ]
     buildkite_tag = os.environ["BUILDKITE_TAG"]

ci/deploy_mz-debug/linux.py

@@ -30,6 +30,7 @@ def main() -> None:
         bazel=bazel,
         bazel_remote_cache=bazel_remote_cache,
         bazel_lto=bazel_lto,
+        image_registry="materialize",
     )
     target = f"{repo.rd.arch}-unknown-linux-gnu"
 

ci/deploy_mz/docker.py

@@ -32,6 +32,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
         mzbuild.Repository(
             Path("."),
@@ -41,6 +42,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
     ]
 

ci/deploy_mz/linux.py

@@ -31,6 +31,7 @@ def main() -> None:
         bazel=bazel,
         bazel_remote_cache=bazel_remote_cache,
         bazel_lto=bazel_lto,
+        image_registry="materialize",
     )
     target = f"{repo.rd.arch}-unknown-linux-gnu"
 

ci/deploy_mz_lsp_server/linux.py

@@ -32,6 +32,7 @@ def main() -> None:
         bazel=bazel,
         bazel_remote_cache=bazel_remote_cache,
         bazel_lto=bazel_lto,
+        image_registry="materialize",
     )
     target = f"{repo.rd.arch}-unknown-linux-gnu"
 

ci/test/build.py

@@ -38,6 +38,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         )
 
         # Build and push any images that are not already available on Docker Hub,

ci/test/dev_tag.py

@@ -34,6 +34,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
         mzbuild.Repository(
             Path("."),
@@ -43,6 +44,7 @@ def main() -> None:
             bazel=bazel,
             bazel_remote_cache=bazel_remote_cache,
             bazel_lto=bazel_lto,
+            image_registry="materialize",
         ),
     ]
     print("--- Tagging development Docker images")

misc/images/ubuntu-base/Dockerfile

@@ -17,6 +17,7 @@ ENV RUST_BACKTRACE=1
 ENV RUST_LIB_BACKTRACE=0
 
 ARG BUILD_PROFILE=optimize
+
 LABEL build.profile=$BUILD_PROFILE
 
 RUN sed -i -e 's#http://archive\.ubuntu\.com#http://us-east-1.ec2.archive.ubuntu.com#' \

misc/python/materialize/ci_util/upload_debug_symbols_to_polarsignals.py

@@ -73,6 +73,7 @@ def main() -> None:
         bazel_remote_cache=bazel_remote_cache,
         bazel_lto=bazel_lto,
         arch=Arch(args.arch),
+        image_registry="materialize",
     )
 
     collect_and_upload_debug_data_to_polarsignals(