Allow default Docker image base to be configurable.

PiperOrigin-RevId: 807371902

Author: konstantin-s-bogom

.buildkite/hooks/pre-command

@@ -8,7 +8,8 @@ clear_docker_containers
 # deleted on an ongoing basis. Such partial deletion can break the cache state.
 # Using per day cache will ensure that builds triggered on a certain day have
 # the full bazel remote cache to use. TTL of the cache must be >1 day.
-export BAZEL_REMOTE_CACHE="--remote_cache=https://storage.googleapis.com/gvisor-buildkite-bazel-cache/cache-$(date +%Y-%m-%d) --google_default_credentials"
+BAZEL_VERSION="$(cat images/default/bazelversion)"
+export BAZEL_REMOTE_CACHE="--remote_cache=https://storage.googleapis.com/gvisor-buildkite-bazel-cache/${BAZEL_VERSION}/$(date +%Y-%m-%d) --google_default_credentials"
 
 if POSIXLY_CORRECT=true df --local --output=pcent,ipcent,target | grep -vE '/snap/' | grep -qE '9[4-9]%|100%'; then
   echo "Disk usage has reached critical level, node is bad." >&2

images/default/Dockerfile

@@ -1,4 +1,5 @@
-FROM ubuntu:22.04
+ARG BASE_IMAGE=ubuntu:22.04
+FROM $BASE_IMAGE
 
 ENV DEBIAN_FRONTEND="noninteractive"
 
@@ -7,14 +8,14 @@ ENV DEBIAN_FRONTEND="noninteractive"
 #       equivalents for your distribution:
 #-------------------------------------------------------------------------------
 RUN apt-get update && apt-get install -y curl gnupg2 git \
-        python-is-python3 python3 python3-distutils python3-pip \
+        python-is-python3 python3 python3-setuptools python3-pip \
         build-essential crossbuild-essential-arm64 qemu-user-static \
         openjdk-11-jdk-headless zip unzip \
         apt-transport-https ca-certificates gnupg-agent \
         software-properties-common \
         pkg-config libffi-dev patch diffutils libssl-dev iptables kmod \
         clang crossbuild-essential-amd64 erofs-utils busybox-static libbpf-dev \
-        iproute2 netcat libnuma-dev
+        iproute2 netcat-openbsd libnuma-dev
 
 # This package is needed to build eBPF on amd64, but not on arm64 where it
 # doesn't exist.
@@ -33,7 +34,7 @@ RUN add-apt-repository \
 RUN apt-get -y install docker-ce-cli
 
 # Install gcloud.
-RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-410.0.0-linux-x86_64.tar.gz | \
+RUN curl https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-535.0.0-linux-x86_64.tar.gz | \
     tar zxf - google-cloud-sdk && \
     google-cloud-sdk/install.sh --quiet && \
     ln -s /google-cloud-sdk/bin/gcloud /usr/bin/gcloud

tools/images.mk

@@ -37,6 +37,8 @@ else
 DOCKER_PLATFORM_ARGS :=
 endif
 
+DOCKER_BUILD_ARGS ?=
+
 # Note that the image prefixes used here must match the image mangling in
 # runsc/testutil.MangleImage. Names are mangled in this way to ensure that all
 # tests are using locally-defined images (that are consistent and idempotent).
@@ -158,8 +160,7 @@ pull-%: register-cross ## Force a repull of the image.
 rebuild = \
   $(call header,REBUILD $(1)) && \
   (T=$$(mktemp -d) && cp -a $(call path,$(1))/* $$T && \
-  $(foreach image,$(shell grep FROM "$(call path,$(1))/$(call dockerfile,$(1))" 2>/dev/null | cut -d' ' -f2),docker pull $(DOCKER_PLATFORM_ARGS) $(image) >&2 &&) \
-  docker build $(DOCKER_PLATFORM_ARGS) \
+  set -x && docker build $(DOCKER_PLATFORM_ARGS) $(DOCKER_BUILD_ARGS) \
     -f "$$T/$(call dockerfile,$(1))" \
     -t "$(call remote_image,$(1)):$(call tag,$(1))" \
     -t "$(call remote_image,$(1))":latest \