adding back jre for component based images as they donot use the deb …

…mapping to auto-install components
GoogleCloudPlatform · Oct 15, 2024 · 8c72af1 · 8c72af1
1 parent d3deda2
commit 8c72af1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile
@@ -19,7 +19,8 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         openssh-client \
         git \
         make \
-        gnupg 
+        gnupg \
+	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/emulators/Dockerfile b/emulators/Dockerfile
@@ -1,4 +1,4 @@
-# debian:buster-slim is used instead of alpine because the cloud bigtable emulator requires glibc.
+# debian12 is used instead of alpine because the cloud bigtable emulator requires glibc.
 FROM marketplace.gcr.io/google/debian12:latest
 
 ARG CLOUD_SDK_VERSION
@@ -21,7 +21,8 @@ RUN ARCH=`cat /tmp/arch` && \
         curl \
         python3 \
         python3-crcmod \
-        bash && \
+        bash \
+        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 && \