Update dockerfiles to install google-cloud-cli (#2847)
google-cloud-sdk got renamed to google-cloud-cli.
diff --git a/buildkite/docker/debian10/Dockerfile b/buildkite/docker/debian10/Dockerfile
index dfe76a9..d7f9f04 100644
--- a/buildkite/docker/debian10/Dockerfile
+++ b/buildkite/docker/debian10/Dockerfile
@@ -65,11 +65,11 @@
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-${BUILDARCH}
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
### https://cloud.google.com/sdk/docs/quickstart-debian-ubuntu
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
### Docker (for legacy rbe_autoconfig)
diff --git a/buildkite/docker/debian11/Dockerfile b/buildkite/docker/debian11/Dockerfile
index b39e0d3..8457faf 100644
--- a/buildkite/docker/debian11/Dockerfile
+++ b/buildkite/docker/debian11/Dockerfile
@@ -59,11 +59,11 @@
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-${BUILDARCH}
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
### https://cloud.google.com/sdk/docs/quickstart-debian-ubuntu
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
### Docker (for legacy rbe_autoconfig)
diff --git a/buildkite/docker/debian12/Dockerfile b/buildkite/docker/debian12/Dockerfile
index 12a2aa6..834d81c 100644
--- a/buildkite/docker/debian12/Dockerfile
+++ b/buildkite/docker/debian12/Dockerfile
@@ -55,10 +55,10 @@
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-${TARGETARCH}
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
### Docker (for legacy rbe_autoconfig)
diff --git a/buildkite/docker/debian13/Dockerfile b/buildkite/docker/debian13/Dockerfile
index 8f59d86..7ac843b 100644
--- a/buildkite/docker/debian13/Dockerfile
+++ b/buildkite/docker/debian13/Dockerfile
@@ -54,11 +54,11 @@
ENV JAVA_HOME /usr/lib/jvm/java-21-openjdk-${TARGETARCH}
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
RUN mkdir -p /usr/share/keyrings && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor -o /usr/share/keyrings/cloud.google.gpg && \
echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
### Docker (for legacy rbe_autoconfig)
diff --git a/buildkite/docker/fedora39/Dockerfile b/buildkite/docker/fedora39/Dockerfile
index 0001765..c9a3521 100644
--- a/buildkite/docker/fedora39/Dockerfile
+++ b/buildkite/docker/fedora39/Dockerfile
@@ -51,7 +51,7 @@
COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
RUN dnf install -y \
- google-cloud-sdk
+ google-cloud-cli
# Bazelisk
RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \
diff --git a/buildkite/docker/fedora40/Dockerfile b/buildkite/docker/fedora40/Dockerfile
index 35444e4..35ffd30 100644
--- a/buildkite/docker/fedora40/Dockerfile
+++ b/buildkite/docker/fedora40/Dockerfile
@@ -51,7 +51,7 @@
COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
RUN dnf install -y \
- google-cloud-sdk
+ google-cloud-cli
# Bazelisk
RUN LATEST_BAZELISK=$(curl -sSI https://github.com/bazelbuild/bazelisk/releases/latest | grep -i '^location: ' | sed 's|.*/||' | sed $'s/\r//') && \
diff --git a/buildkite/docker/fedora43/Dockerfile b/buildkite/docker/fedora43/Dockerfile
index e70f4d5..3f225c3 100644
--- a/buildkite/docker/fedora43/Dockerfile
+++ b/buildkite/docker/fedora43/Dockerfile
@@ -50,7 +50,7 @@
COPY google-cloud-sdk.repo /etc/yum.repos.d/google-cloud-sdk.repo
RUN dnf install -y \
- google-cloud-sdk \
+ google-cloud-cli \
&& dnf clean all \
&& rm -rf /var/cache/yum
diff --git a/buildkite/docker/rockylinux8/Dockerfile b/buildkite/docker/rockylinux8/Dockerfile
index 7e8d89b..c493f1e 100644
--- a/buildkite/docker/rockylinux8/Dockerfile
+++ b/buildkite/docker/rockylinux8/Dockerfile
@@ -20,7 +20,7 @@
glibc-langpack-en \
glibc-locale-source \
gnupg2 \
- google-cloud-sdk \
+ google-cloud-cli \
iproute \
lcov \
llvm \
diff --git a/buildkite/docker/ubuntu2204/Dockerfile b/buildkite/docker/ubuntu2204/Dockerfile
index 94d735b..01c1241 100644
--- a/buildkite/docker/ubuntu2204/Dockerfile
+++ b/buildkite/docker/ubuntu2204/Dockerfile
@@ -65,11 +65,11 @@
FROM ubuntu2204-bazel-nojdk AS ubuntu2204-nojdk
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
### https://cloud.google.com/sdk/docs/quickstart-debian-ubuntu
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
# Bazelisk
diff --git a/buildkite/docker/ubuntu2404/Dockerfile b/buildkite/docker/ubuntu2404/Dockerfile
index 5d48c48..19511a6 100644
--- a/buildkite/docker/ubuntu2404/Dockerfile
+++ b/buildkite/docker/ubuntu2404/Dockerfile
@@ -65,11 +65,11 @@
FROM ubuntu2404-bazel-nojdk AS ubuntu2404-nojdk
-### Install Google Cloud SDK.
+### Install Google Cloud CLI.
### https://cloud.google.com/sdk/docs/quickstart-debian-ubuntu
RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] http://packages.cloud.google.com/apt cloud-sdk main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list && \
curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - && \
- apt-get update -y && apt-get install google-cloud-sdk -y && \
+ apt-get update -y && apt-get install google-cloud-cli -y && \
rm -rf /var/lib/apt/lists/*
# Bazelisk