Ubuntu (Nix) container removed (#1827)
**EDIT**: Based on the iteration here, I realized that I could in fact
install Nix in single-user mode as part of the `setup` phase of
`bazelci.py`, meaning that a container preloaded with Nix isn't
necessary. Oops 😅
Ubuntu (Nix) container explicitly creates a `buildkite` user to match
the user mapped in when run by BuildKite and Nix is updated to run in
multi-user (daemon) mode via an `ENTRYPOINT` script.
Verified with `docker run -it --rm -u 997:997
gcr.io/bazel-public/ubuntu2204-nix python3` followed by `import certifi`
to validate Python still works, and then `docker run --rm -u 997:997
gcr.io/bazel-public/ubuntu2204-nix /bin/sh -e -c $'cd ~/\n git clone
https://github.com/ConsumingChaos/rules_rust.git\n cd rules_rust\n git
checkout wasm32_cc_info\n cd examples/nix_cross_compiling\n
CARGO_BAZEL_REPIN=true bazel build //:nix_cross_compiling'` to verify
the actual Bazel example target builds.
The `CARGO_BAZEL_REPIN=true` shouldn't be part of the normal run (I
don't think...), but that's something to be fixed in `rules_rust` and
not an issue with the container thankfully 😅
diff --git a/buildkite/bazelci.py b/buildkite/bazelci.py
index e0b7ece..c212601 100755
--- a/buildkite/bazelci.py
+++ b/buildkite/bazelci.py
@@ -482,13 +482,6 @@
"docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/fedora39-java17",
"python": "python3",
},
- "ubuntu2204-nix": {
- "name": "Ubuntu (Nix)",
- "emoji-name": ":nix:",
- "publish_binary": [],
- "docker-image": f"gcr.io/{DOCKER_REGISTRY_PREFIX}/ubuntu2204-nix",
- "python": "python3",
- },
"macos": {
"name": "macOS (OpenJDK 11, Xcode)",
"emoji-name": ":darwin: (OpenJDK 11, Xcode)",
@@ -1493,7 +1486,7 @@
# or the requested version is not installed.
if xcode_version not in supported_versions:
xcode_version = supported_versions[0]
-
+
if not wanted_xcode_version or wanted_xcode_version == xcode_version:
print_collapsed_group(":xcode: Activating Xcode {}...".format(xcode_version))
else:
