From 8c72af1b719c3a708520e320f068224baa3f89fd Mon Sep 17 00:00:00 2001 From: Md Anindya Prodhan Date: Tue, 15 Oct 2024 15:44:12 +0000 Subject: [PATCH] adding back jre for component based images as they donot use the deb mapping to auto-install components --- debian_component_based/Dockerfile | 3 ++- emulators/Dockerfile | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile index 7ba5ad7e..e5135c3f 100644 --- 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 index 5f2a7645..c40c271a 100644 --- 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 && \