From 5436842151a69b1dd3e0c4350c7406b4fba36805 Mon Sep 17 00:00:00 2001
From: Jonathan Tatum <jdtatum@google.com>
Date: Mon, 1 Jun 2026 12:51:26 -0700
Subject: [PATCH] Update presubmit docker image.

Use bazelisk to simplify testing bazel upgrades.

PiperOrigin-RevId: 924861509
---
 Dockerfile      | 45 +++++++++++++++++++++++++++++----------------
 cloudbuild.yaml |  4 ++--
 2 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c2c2915be..97611fc75 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,25 +12,25 @@
 #
 # Run the following command from the root of the CEL repository:
 #
-#     gcloud builds submit --region=us -t gcr.io/cel-analysis/gcc9 .
+#     gcloud builds submit --region=us -t gcr.io/cel-analysis/cel-cpp/ubuntu_floor .
 #
 # Once complete get the sha256 digest from the output using the following
 # command:
 #
-#     gcloud artifacts versions list --package=gcc9 --repository=gcr.io \
+#     gcloud artifacts versions list --package=cel-cpp/ubuntu_floor --repository=gcr.io \
 #       --location=us
 #
 # The cloudbuild.yaml file must be updated to use the new digest like so:
 #
-#     - name: 'gcr.io/cel-analysis/gcc9@<SHA256>'
-FROM gcc:9
+#     - name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@<SHA256>'
+FROM gcr.io/cloud-marketplace/google/ubuntu2204:latest
 
 # Install Bazel prerequesites and required tools.
 # See https://docs.bazel.build/versions/master/install-ubuntu.html
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y --no-install-recommends \
-      ca-certificates \
+RUN apt-get update && apt-get upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+    bash \
+    ca-certificates \
       git \
       libssl-dev \
       make \
@@ -41,16 +41,29 @@ RUN apt-get update && \
       zip \
       zlib1g-dev \
       default-jdk-headless \
-      clang-11 && \
-    apt-get clean
+      clang-11 \
+      gcc-9 g++-9 \
+      tzdata \
+      && apt-get clean
 
-# Install Bazel.
-# https://github.com/bazelbuild/bazel/releases
-ARG BAZEL_VERSION="7.3.2"
-ADD https://github.com/bazelbuild/bazel/releases/download/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-installer-linux-x86_64.sh /tmp/install_bazel.sh
-RUN /bin/bash /tmp/install_bazel.sh && rm /tmp/install_bazel.sh
+# Install Bazelisk.
+# https://github.com/bazelbuild/bazelisk/releases
+ARG BAZELISK_URL="https://github.com/bazelbuild/bazelisk/releases/download/v1.27.0/bazelisk-amd64.deb"
+ARG BAZELISK_CHKSUM="d8b00ea975c823e15263c80200ac42979e17368547fbff4ab177af035badfa83"
+ADD ${BAZELISK_URL} /tmp/bazelisk.deb
+
+ENV BAZELISK_CHKSUM=${BAZELISK_CHKSUM}
+RUN echo "${BAZELISK_CHKSUM} */tmp/bazelisk.deb" | sha256sum --check
+
+RUN apt-get install /tmp/bazelisk.deb
 
 RUN mkdir -p /workspace
 RUN mkdir -p /bazel
 
-ENTRYPOINT ["/usr/local/bin/bazel"]
+RUN USE_BAZEL_VERSION=8.7.0 bazelisk help
+RUN USE_BAZEL_VERSION=7.3.2 bazelisk help
+
+ENV CC=gcc-9
+ENV CXX=g++-9
+
+ENTRYPOINT ["/usr/bin/bazelisk"]
diff --git a/cloudbuild.yaml b/cloudbuild.yaml
index 8272378f6..dec359f25 100644
--- a/cloudbuild.yaml
+++ b/cloudbuild.yaml
@@ -1,5 +1,5 @@
 steps:
-- name: 'gcr.io/cel-analysis/gcc9@sha256:4d5ff2e55224398807235a44b57e9c5793e922ac46e9ff428536bb8f8e5790ce'
+- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:211a0c505b361d987b3d8b08a5144a84e62cb95edc3f897fe46d5cd3f556f79d'
   args:
   - '--output_base=/bazel' # This is mandatory to avoid steps accidently sharing data.
   - 'test'
@@ -16,7 +16,7 @@ steps:
   - '--google_default_credentials'
   id: gcc-9
   waitFor: ['-']
-- name: 'gcr.io/cel-analysis/gcc9@sha256:4d5ff2e55224398807235a44b57e9c5793e922ac46e9ff428536bb8f8e5790ce'
+- name: 'gcr.io/cel-analysis/cel-cpp/ubuntu_floor@sha256:211a0c505b361d987b3d8b08a5144a84e62cb95edc3f897fe46d5cd3f556f79d'
   env:
   - 'CC=clang-11'
   - 'CXX=clang++-11'