From a0015bc7a37b5464279106928898a2a709b63082 Mon Sep 17 00:00:00 2001
From: Robert Volkmann <robert.volkmann@x-cellent.com>
Date: Fri, 25 Oct 2024 16:12:29 +0200
Subject: [PATCH] Create a base image without gcloud and save one gb

---
 .github/workflows/docker.yaml | 15 ++++++++++++---
 Dockerfile                    | 32 ++++++++++++++++++--------------
 2 files changed, 30 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/docker.yaml b/.github/workflows/docker.yaml
index a8e1e98..8e19aba 100644
--- a/.github/workflows/docker.yaml
+++ b/.github/workflows/docker.yaml
@@ -40,9 +40,18 @@ jobs:
         [ "${GITHUB_EVENT_NAME}" == 'release' ] && echo "tag=${GITHUB_REF##*/}" >> $GITHUB_ENV || true
         [ "${GITHUB_EVENT_NAME}" == 'push' ] && echo "tag=latest" >> $GITHUB_ENV || true
 
-    - name: Build and push image
-      uses: docker/build-push-action@v5
+    - name: Build and push base image
+      uses: docker/build-push-action@v6
       with:
         context: .
         push: true
-        tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.tag }}
+        tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.tag }}-base
+        target: base
+
+    - name: Build and push gcloud image
+      uses: docker/build-push-action@v6
+      with:
+        context: .
+        push: true
+        tags: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}:${{ env.tag }}-gcloud
+        target: gcloud
diff --git a/Dockerfile b/Dockerfile
index b66a43b..07a18a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,7 @@
-FROM python:3.11-slim
+FROM python:3.11-slim AS base
 
 ENV VERSION_CT=0.9.0 \
-    VERSION_HELM=3.12.3 \
-    CLOUD_SDK_VERSION=465.0.0
-
-ENV PATH /google-cloud-sdk/bin:$PATH
+    VERSION_HELM=3.12.3
 
 RUN set -x \
  && apt-get update \
@@ -17,15 +14,6 @@ RUN set -x \
         openssh-client \
         rsync \
  && rm -rf /var/lib/apt/lists/* \
- && curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
- && tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
- && rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.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 \
- && gcloud components install gke-gcloud-auth-plugin \
- && rm -rf /google-cloud-sdk/.install/.backup \
- && gcloud --version \
  && curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -s -- --version "v${VERSION_HELM}" \
  && helm plugin install https://github.com/databus23/helm-diff \
  && python3 -m pip install --disable-pip-version-check --no-cache-dir \
@@ -46,3 +34,19 @@ RUN set -x \
 COPY ansible.cfg /etc/ansible/ansible.cfg
 
 ENTRYPOINT []
+
+FROM base AS gcloud
+
+ENV CLOUD_SDK_VERSION=465.0.0
+
+ENV PATH=/google-cloud-sdk/bin:$PATH
+
+RUN  curl -O https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
+ && tar xzf google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.tar.gz \
+ && rm google-cloud-sdk-${CLOUD_SDK_VERSION}-linux-x86_64.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 \
+ && gcloud components install gke-gcloud-auth-plugin \
+ && rm -rf /google-cloud-sdk/.install/.backup \
+ && gcloud --version \