tries a minimal gsutil install from the gcloud-sdk image

Author: solsson

.github/workflows/images.yaml

@@ -106,22 +106,22 @@ jobs:
         cache-to: type=gha,mode=max
         build-contexts: |
           yolean/builder-base=docker-image://ghcr.io/yolean/builder-base
-    # -
-    #   name: Build and push builder-base-gcloud latest
-    #   uses: docker/build-push-action@v5
-    #   env:
-    #     SOURCE_DATE_EPOCH: 0
-    #   with:
-    #     context: builder-base-gcloud
-    #     tags: |
-    #       ghcr.io/yolean/builder-base-gcloud:latest
-    #       ghcr.io/yolean/builder-base-gcloud:${{ github.sha }}
-    #     platforms: linux/amd64,linux/arm64/v8
-    #     push: true
-    #     cache-from: type=gha
-    #     cache-to: type=gha,mode=max
-    #     build-contexts: |
-    #       yolean/builder-base=docker-image://ghcr.io/yolean/builder-base
+    -
+      name: Build and push builder-base-gcloud latest
+      uses: docker/build-push-action@v5
+      env:
+        SOURCE_DATE_EPOCH: 0
+      with:
+        context: builder-base-gcloud
+        tags: |
+          ghcr.io/yolean/builder-base-gcloud:latest
+          ghcr.io/yolean/builder-base-gcloud:${{ github.sha }}
+        platforms: linux/amd64,linux/arm64/v8
+        push: true
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
+        build-contexts: |
+          yolean/builder-base=docker-image://ghcr.io/yolean/builder-base
     -
       name: Build and push builder-tooling latest
       uses: docker/build-push-action@v5
@@ -183,6 +183,9 @@ jobs:
         push: true
         cache-from: type=gha
         cache-to: type=gha,mode=max
+        build-contexts: |
+          yolean/builder-base-gcc=docker-image://ghcr.io/yolean/builder-base-gcc
+          yolean/builder-base-gcloud=docker-image://ghcr.io/yolean/builder-base-gcloud
     -
       name: Build and push git-init latest
       uses: docker/build-push-action@v5

builder-base-gcloud/Dockerfile

@@ -1,20 +1,28 @@
+# based on https://hub.docker.com/r/google/cloud-sdk this seems to be the only debian based tag that supports arm
+#FROM --platform=$TARGETPLATFORM google/cloud-sdk:debian_component_based as cloud-sdk
+FROM --platform=$TARGETPLATFORM google/cloud-sdk:slim as cloud-sdk
+
+# RUN mv /google-cloud-sdk /google-cloud-sdk-full \
+#   && mkdir -p /google-cloud-sdk/bin \
+#   && cp /google-cloud-sdk-full/bin/gsutil /google-cloud-sdk/bin/ \
+#   && gsutil version && false
+
 FROM --platform=$TARGETPLATFORM yolean/builder-base
 
 USER root
 RUN set -ex; \
   export DEBIAN_FRONTEND=noninteractive; \
-  runDeps='python3 google-cloud-cli rsync'; \
-  buildDeps='gnupg2'; \
-  \
-  apt-get update && apt-get install -y --no-install-recommends $buildDeps; \
-  echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" > /etc/apt/sources.list.d/google-cloud-sdk.list; \
-  curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | gpg --dearmor > /usr/share/keyrings/cloud.google.gpg; \
+  runDeps='python3 rsync'; \
   \
   apt-get update && apt-get install -y --no-install-recommends $runDeps $buildDeps; \
-  gcloud version; \
-  gsutil version; \
   \
-  apt-get purge -y --auto-remove $buildDeps; \
   rm -rf /var/lib/apt/lists; \
   rm -rf /var/log/dpkg.log /var/log/alternatives.log /var/log/apt /root/.gnupg
 USER nonroot:nogroup
+
+COPY --from=cloud-sdk /usr/lib/google-cloud-sdk/platform/gsutil /usr/local/gsutil
+COPY --from=cloud-sdk /usr/lib/google-cloud-sdk/platform/bundledpythonunix /usr/local/bundledpythonunix
+
+ENV PATH="${PATH}:/usr/local/gsutil"
+
+RUN gsutil version

builder-evidence/Dockerfile

@@ -16,7 +16,7 @@ ENV NODE_PATH=/usr/local/lib/node_modules
 RUN npm install -g --ignore-scripts node-gyp@latest
 RUN npm install -g duckdb@latest
 
-FROM --platform=$TARGETPLATFORM yolean/builder-base
+FROM --platform=$TARGETPLATFORM yolean/builder-base-gcloud
 
 RUN y-parquet-tools -h
 COPY --from=node-gyp /usr/local/bin/duckdb /usr/local/bin/duckdb

builder-quarkus/Dockerfile

@@ -30,11 +30,10 @@ COPY --from=dockerclient /usr/local/bin/* /usr/local/bin/
 COPY --from=dockerclient /usr/local/libexec/docker /usr/local/libexec/docker
 COPY --chown=nonroot:nogroup y-build-* /usr/local/bin/
 
-RUN [ "$PATH" = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/src/ystack/bin" ]
 ENV \
   CI=true \
   GRAALVM_HOME=/opt/mandrel \
   JAVA_HOME=/opt/mandrel \
   MAVEN_HOME=/usr/share/maven \
   MAVEN_CONFIG=/home/nonroot/.m2 \
-  PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/src/ystack/bin:/usr/share/maven/bin:/opt/mandrel/bin
+  PATH="${PATH}:/usr/share/maven/bin:/opt/mandrel/bin"