sdk → cli

Signed-off-by: Tomasz Janiszewski <[email protected]>
stackrox · Mar 11, 2024 · 4e01999 · 4e01999
1 parent 3f5d327
commit 4e01999
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/images/collector.Dockerfile b/images/collector.Dockerfile
@@ -17,7 +17,7 @@ RUN dnf update -y && \
     dnf install -y \
         clang-tools-extra \
         cmake \
-        google-cloud-sdk \
+        google-cloud-cli \
         jq \
         procps-ng \
         python38 \

diff --git a/images/jenkins-plugin.Dockerfile b/images/jenkins-plugin.Dockerfile
@@ -16,7 +16,7 @@ RUN set -ex \
  && curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add - \
  && sudo apt-get update \
  && sudo apt-get install --no-install-recommends -y \
-      google-cloud-sdk \
+      google-cloud-cli \
       kubectl \
       openjdk-8-jdk-headless \
       maven \

diff --git a/images/scanner-test.Dockerfile b/images/scanner-test.Dockerfile
@@ -42,8 +42,8 @@ RUN dnf install -y \
         expect \
         gcc \
         gcc-c++ \
-        google-cloud-sdk \
-        google-cloud-sdk-gke-gcloud-auth-plugin \
+        google-cloud-cli \
+        google-cloud-cli-gke-gcloud-auth-plugin \
         jq \
         kubectl \
         lsof \

diff --git a/images/stackrox-test.Dockerfile b/images/stackrox-test.Dockerfile
@@ -28,12 +28,12 @@ RUN dnf --disablerepo="*" install -y https://download.postgresql.org/pub/repos/y
 
 # Install all the packages
 RUN dnf update -y && \
-    dnf install -y \
+    dnf install -y --best --allowerasing \
         expect \
         gcc \
         gcc-c++ \
-        google-cloud-sdk \
-        google-cloud-sdk-gke-gcloud-auth-plugin \
+        google-cloud-cli \
+        google-cloud-cli-gke-gcloud-auth-plugin \
         java-17-openjdk-devel \
         kubectl \
         lsof \