Update base image to Debian Bookworm

GoogleCloudPlatform · Nov 10, 2023 · 350c592 · 350c592
1 parent e96ec52
commit 350c592
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 13 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker:24.0.7 as static-docker-source
 
-FROM debian:bullseye
+FROM debian:bookworm
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 COPY --from=static-docker-source /usr/local/bin/docker /usr/local/bin/docker
@@ -17,9 +17,8 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
  git \
  make \
  gnupg && \
- export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
- echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
+ echo "deb [signed-by=/usr/share/keyrings/cloud.google.asc] https://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 | tee /usr/share/keyrings/cloud.google.asc && \
  apt-get update && \
  apt-get install -y google-cloud-cli=${CLOUD_SDK_VERSION}-0 \
  google-cloud-cli-app-engine-python=${CLOUD_SDK_VERSION}-0 \

diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker:24.0.7 as static-docker-source
 
-FROM debian:bullseye
+FROM debian:bookworm
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 ENV PATH /google-cloud-sdk/bin:$PATH
@@ -20,7 +20,7 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
  git \
  make \
  gnupg \
- openjdk-11-jre-headless
+ openjdk-17-jre-headless
 RUN if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi;
 RUN ARCH=`cat /tmp/arch` && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
  tar xzf google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \

diff --git a/debian_slim/Dockerfile b/debian_slim/Dockerfile
@@ -1,6 +1,6 @@
 FROM docker:24.0.7 as static-docker-source
 
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 COPY --from=static-docker-source /usr/local/bin/docker /usr/local/bin/docker
@@ -13,16 +13,15 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
  curl \
  gcc \
  python3-dev \
- python3-crcmod \
  python3-pip \
+ python3-crcmod \
  apt-transport-https \
  lsb-release \
  openssh-client \
  git \
  gnupg && \
- export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)" && \
- echo "deb https://packages.cloud.google.com/apt $CLOUD_SDK_REPO main" > /etc/apt/sources.list.d/google-cloud-sdk.list && \
- curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
+ echo "deb [signed-by=/usr/share/keyrings/cloud.google.asc] https://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 | tee /usr/share/keyrings/cloud.google.asc && \
  apt-get update && apt-get install -y google-cloud-cli=${CLOUD_SDK_VERSION}-0 $INSTALL_COMPONENTS && \
  gcloud config set core/disable_usage_reporting true && \
  gcloud config set component_manager/disable_update_check true && \

diff --git a/emulators/Dockerfile b/emulators/Dockerfile
@@ -1,5 +1,5 @@
 # debian:buster-slim is used instead of alpine because the cloud bigtable emulator requires glibc.
-FROM debian:bullseye-slim
+FROM debian:bookworm-slim
 
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
@@ -22,7 +22,7 @@ RUN ARCH=`cat /tmp/arch` && \
  python3 \
  python3-crcmod \
  bash \
- openjdk-11-jre-headless && \
+ openjdk-17-jre-headless && \
  curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
  tar xzf google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
  rm google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \