Merge pull request #294 from GoogleCloudPlatform/kaiqi-dockerfile-update

dockerfile update - change sdk to cli
GoogleCloudPlatform · Nov 17, 2022 · 90ae21b · 90ae21b
2 parents 51b3dab + 7f8b6b3
commit 90ae21b
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -21,21 +21,21 @@ RUN apt-get -qqy update && apt-get install -qqy \
     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 && \
-    apt-get install -y google-cloud-sdk=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-app-engine-python=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-app-engine-python-extras=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-app-engine-java=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-app-engine-go=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-datalab=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-datastore-emulator=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-pubsub-emulator=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-bigtable-emulator=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-firestore-emulator=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-spanner-emulator=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-cbt=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-kpt=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-local-extract=${CLOUD_SDK_VERSION}-0 \
-        google-cloud-sdk-gke-gcloud-auth-plugin=${CLOUD_SDK_VERSION}-0 \
+    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 \
+        google-cloud-cli-app-engine-java=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-app-engine-go=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-datalab=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-datastore-emulator=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-pubsub-emulator=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-bigtable-emulator=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-firestore-emulator=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-spanner-emulator=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-cbt=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-kpt=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-local-extract=${CLOUD_SDK_VERSION}-0 \
+        google-cloud-cli-gke-gcloud-auth-plugin=${CLOUD_SDK_VERSION}-0 \
         kubectl && \
     gcloud --version && \
     docker --version && kubectl version --client

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
@@ -18,9 +18,9 @@ RUN ARCH=`cat /tmp/arch` && apk --no-cache add \
         openssh-client \
         git \
         gnupg \
-    && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
+    && 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 && \
     gcloud config set core/disable_usage_reporting true && \
     gcloud config set component_manager/disable_update_check true && \
     gcloud config set metrics/environment github_docker_image && \

diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile
@@ -21,9 +21,9 @@ RUN apt-get -qqy update && apt-get install -qqy \
         gnupg \
         openjdk-11-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-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz
+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 "app-engine-java app-engine-python alpha beta pubsub-emulator cloud-datastore-emulator app-engine-go bigtable cbt datalab app-engine-python-extras kubectl gke-gcloud-auth-plugin kustomize minikube skaffold kpt local-extract" > /tmp/additional_components
 # These components are not available on ARM right now.
 RUN if [ `uname -m` = 'x86_64' ]; then echo -n " appctl nomos anthos-auth" >> /tmp/additional_components; fi;

diff --git a/debian_slim/Dockerfile b/debian_slim/Dockerfile
@@ -23,7 +23,7 @@ RUN apt-get update -qqy && apt-get install -qqy \
     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 && apt-get install -y google-cloud-sdk=${CLOUD_SDK_VERSION}-0 $INSTALL_COMPONENTS && \
+    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 && \
     gcloud config set metrics/environment github_docker_image && \

diff --git a/emulators/Dockerfile b/emulators/Dockerfile
@@ -22,9 +22,9 @@ RUN ARCH=`cat /tmp/arch` && \
         python3-crcmod \
         bash \
         openjdk-11-jre-headless && \
-    curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
-    rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-${ARCH}.tar.gz && \
+    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 && \
     gcloud config set core/disable_usage_reporting true && \
     gcloud config set component_manager/disable_update_check true && \
     gcloud config set metrics/environment github_docker_image_emulator && \