Merge pull request #607 from GoogleCloudPlatform/s4shyam95-patch-2

Update Dockerfile for alpine and all_component to allow a non-default (optional) stage that includes TESTING component.

Author: s4shyam95

all_components/Dockerfile

@@ -1,4 +1,5 @@
-FROM marketplace.gcr.io/google/debian12:latest
+ARG FINAL_STAGE=prod
+FROM marketplace.gcr.io/google/debian12:latest AS prod
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 ENV PATH /google-cloud-sdk/bin:$PATH
@@ -18,14 +19,36 @@ RUN echo 'deb http://deb.debian.org/debian/ sid main' >> /etc/apt/sources.list &
         make \
         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 && \
-    rm google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz
-RUN echo -n "anthoscli app-engine-java app-engine-python alpha beta pubsub-emulator cloud-datastore-emulator app-engine-go bigtable cbt app-engine-python-extras kubectl gke-gcloud-auth-plugin kustomize minikube skaffold kpt local-extract cloud-sql-proxy docker-credential-gcr package-go-module cloud-firestore-emulator cloud-run-proxy log-streaming managed-flink-client terraform-tools config-connector enterprise-certificate-proxy istioctl kubectl-oidc pkg" > /tmp/additional_components
-# These components are not available on ARM right now.
-RUN if [ `uname -m` = 'x86_64' ]; then echo -n " nomos anthos-auth cloud-spanner-emulator spanner-migration-tool" >> /tmp/additional_components; fi;
-RUN /google-cloud-sdk/install.sh --bash-completion=false --path-update=true --usage-reporting=false \
-	--additional-components `cat /tmp/additional_components` && rm -rf /google-cloud-sdk/.install/.backup
+RUN if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi; \
+    ARCH=`cat /tmp/arch` && \
+    if [ -z "$CLOUD_SDK_VERSION" ]; then \
+        SDK_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-${ARCH}.tar.gz"; \
+        SDK_TAR="google-cloud-cli-linux-${ARCH}.tar.gz"; \
+    else \
+        SDK_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz"; \
+        SDK_TAR="google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz"; \
+    fi && \
+    curl -O "${SDK_URL}" && \
+    tar xzf "${SDK_TAR}" && \
+    rm "${SDK_TAR}" && \
+    echo -n "anthoscli app-engine-java app-engine-python alpha beta pubsub-emulator cloud-datastore-emulator app-engine-go bigtable cbt app-engine-python-extras kubectl gke-gcloud-auth-plugin kustomize minikube skaffold kpt local-extract cloud-sql-proxy docker-credential-gcr package-go-module cloud-firestore-emulator cloud-run-proxy log-streaming managed-flink-client terraform-tools config-connector enterprise-certificate-proxy istioctl kubectl-oidc pkg" > /tmp/additional_components && \ # These components are not available on ARM right now.
+    if [ `uname -m` = 'x86_64' ]; then echo -n " nomos anthos-auth cloud-spanner-emulator spanner-migration-tool" >> /tmp/additional_components; fi && \
+    /google-cloud-sdk/install.sh --bash-completion=false --path-update=true --usage-reporting=false --additional-components `cat /tmp/additional_components` && \
+    rm -rf /google-cloud-sdk/.install/.backup
 RUN git config --system credential.'https://source.developers.google.com'.helper gcloud.sh
 VOLUME ["/root/.config", "/root/.kube"]
+
+FROM prod AS test
+ARG INSTALL_COMPONENTS_TEST=false
+COPY release/ /tmp/cloud-sdk-release
+RUN if [ "$INSTALL_COMPONENTS_TEST" = "true" ]; then \
+        ARCH=`cat /tmp/arch` && \
+        cp "/tmp/cloud-sdk-release/linux_${ARCH}_components-2.json" "/tmp/cloud-sdk-release/components-2.json" && \
+        cp "/tmp/cloud-sdk-release/linux_${ARCH}_components-vHEAD.json" "/tmp/cloud-sdk-release/components-vHEAD.json" && \
+        export CLOUDSDK_COMPONENT_MANAGER_SNAPSHOT_URL="file:///tmp/cloud-sdk-release/components-2.json,file:///tmp/cloud-sdk-release/components-2-TESTING.json" && \
+        /google-cloud-sdk/install.sh --bash-completion=false --path-update=true --usage-reporting=false && \
+        gcloud components update && \
+        gcloud components install TESTING; \
+    fi
+
+FROM ${FINAL_STAGE}

alpine/Dockerfile

@@ -1,11 +1,12 @@
-FROM alpine:3.20
+ARG FINAL_STAGE=prod
+FROM alpine:3.20 AS prod
 ARG CLOUD_SDK_VERSION
 ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION
 ENV PATH /google-cloud-sdk/bin:$PATH
 RUN addgroup -g 1000 -S cloudsdk && \
     adduser -u 1000 -S cloudsdk -G cloudsdk
-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` && apk --no-cache upgrade && apk --no-cache add \
+RUN if [ `uname -m` = 'x86_64' ]; then echo -n "x86_64" > /tmp/arch; else echo -n "arm" > /tmp/arch; fi; \
+    ARCH=`cat /tmp/arch` && apk --no-cache upgrade && apk --no-cache add \
         curl \
         python3 \
         py3-crcmod \
@@ -15,15 +16,37 @@ RUN ARCH=`cat /tmp/arch` && apk --no-cache upgrade && apk --no-cache add \
         openssh-client \
         git \
         gnupg \
-    && 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 && \
+    && \
+    if [ -z "$CLOUD_SDK_VERSION" ]; then \
+        SDK_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-linux-${ARCH}.tar.gz"; \
+        SDK_TAR="google-cloud-cli-linux-${ARCH}.tar.gz"; \
+    else \
+        SDK_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz"; \
+        SDK_TAR="google-cloud-cli-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz"; \
+    fi && \
+    curl -O "${SDK_URL}" && \
+    tar xzf "${SDK_TAR}" && \
+    rm "${SDK_TAR}" && \
     gcloud config set core/disable_usage_reporting true && \
     gcloud config set component_manager/disable_update_check true && \
     gcloud config set metrics/environment docker_image_alpine && \
     gcloud --version && \
-    gsutil version -l && \	
+    gsutil version -l && \
     bq version && \
     gcloud-crc32c /google-cloud-sdk/bin/gcloud
 RUN git config --system credential.'https://source.developers.google.com'.helper gcloud.sh
 VOLUME ["/root/.config"]
+
+FROM prod AS test
+ARG INSTALL_COMPONENTS_TEST=false
+COPY release/ /tmp/cloud-sdk-release
+RUN if [ "$INSTALL_COMPONENTS_TEST" = "true" ]; then \
+        ARCH=`cat /tmp/arch` && \
+        cp "/tmp/cloud-sdk-release/linux_${ARCH}_components-2.json" "/tmp/cloud-sdk-release/components-2.json" && \
+        cp "/tmp/cloud-sdk-release/linux_${ARCH}_components-vHEAD.json" "/tmp/cloud-sdk-release/components-vHEAD.json" && \
+        export CLOUDSDK_COMPONENT_MANAGER_SNAPSHOT_URL="file:///tmp/cloud-sdk-release/components-2.json,file:///tmp/cloud-sdk-release/components-2-TESTING.json" && \
+        gcloud components update && \
+        gcloud components install TESTING; \
+    fi
+
+FROM ${FINAL_STAGE}