Upgrade to java 21 for datastore and firestore emulators support (#584)

* Update java version for `:debian_component_based` and `:emulators` images to java 21`

* fix sid install command

* Use sid repo for java 21 only, for the other packages we should use the default repository

Author: anindyatahsin

Dockerfile

@@ -6,6 +6,7 @@ ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 COPY --from=static-docker-source /usr/local/bin/docker /usr/local/bin/docker
 RUN groupadd -r -g 1000 cloudsdk && \
     useradd -r -u 1000 -m -s /bin/bash -g cloudsdk cloudsdk
+
 RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         curl \
         python3-dev \
@@ -15,11 +16,22 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         openssh-client \
         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 - && \
-    apt-get update && \
+	gcc \
+	python3-pip \
+        gnupg
+RUN echo 'deb http://deb.debian.org/debian/ sid main' >> /etc/apt/sources.list && \
+    apt-get update -qqy && apt-get -qqy upgrade && \
+    apt-get -y -t sid install openjdk-21-jre-headless
+RUN apt-get update -qqy 
+RUN export CLOUD_SDK_REPO="cloud-sdk-$(lsb_release -c -s)"
+RUN curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg \
+    | gpg --dearmor -o /etc/apt/trusted.gpg.d/google-cloud.gpg
+
+# Add the repo
+RUN echo "deb [signed-by=/etc/apt/trusted.gpg.d/google-cloud.gpg] http://packages.cloud.google.com/apt cloud-sdk main" \
+    > /etc/apt/sources.list.d/google-cloud-sdk.list 
+
+RUN apt-get update && \
     apt-get install -y google-cloud-cli=${CLOUD_SDK_VERSION}-0 \
         google-cloud-cli-app-engine-python=${CLOUD_SDK_VERSION}-0 \
         google-cloud-cli-app-engine-python-extras=${CLOUD_SDK_VERSION}-0 \
@@ -40,8 +52,5 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
     gcloud config set metrics/environment docker_image_latest && \
     gcloud --version && \
     docker --version && kubectl version --client
-RUN apt-get install -qqy \
-        gcc \
-        python3-pip
 RUN git config --system credential.'https://source.developers.google.com'.helper gcloud.sh
 VOLUME ["/root/.config", "/root/.kube"]

all_components/Dockerfile

@@ -4,7 +4,8 @@ ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 ENV PATH /google-cloud-sdk/bin:$PATH
 RUN groupadd -r -g 1000 cloudsdk && \
     useradd -r -u 1000 -m -s /bin/bash -g cloudsdk cloudsdk
-RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
+RUN echo 'deb http://deb.debian.org/debian/ sid main' >> /etc/apt/sources.list && \
+    apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         curl \
         gcc \
         python3-dev \
@@ -15,8 +16,8 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         openssh-client \
         git \
         make \
-        gnupg \	
-        openjdk-17-jre-headless
+        gnupg && \
+    apt-get -y -t sid install openjdk-21-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 && \

debian_component_based/Dockerfile

@@ -15,8 +15,10 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \
         openssh-client \
         git \
         make \
-        gnupg \
-	openjdk-17-jre-headless
+        gnupg
+RUN echo 'deb http://deb.debian.org/debian/ sid main' >> /etc/apt/sources.list && \
+    apt-get update -qqy && apt-get -qqy upgrade && \
+    apt-get -y -t sid install openjdk-21-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 && \

emulators/Dockerfile

@@ -21,8 +21,10 @@ RUN ARCH=`cat /tmp/arch` && \
         curl \
         python3 \
         python3-crcmod \
-        bash \
-        openjdk-17-jre-headless && \
+        bash && \
+    echo 'deb http://deb.debian.org/debian/ sid main' >> /etc/apt/sources.list && \
+    apt-get update && apt-get -qqy upgrade && \
+    apt-get -y -t sid install openjdk-21-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 && \