From 6662446681df21e2281c388488023fc5e737c320 Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Thu, 19 Mar 2026 21:21:36 +0300 Subject: [PATCH 1/2] Handle ARM Google Cloud SDK layout --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bad3a2a..c2ca711 100644 --- a/Dockerfile +++ b/Dockerfile @@ -96,9 +96,11 @@ RUN ARCH=$(uname -m) && \ fi && \ tar -xzf google-cloud-sdk.tar.gz && \ ./google-cloud-sdk/install.sh -q && \ + if [ -x ./google-cloud-sdk/platform/bundledpythonunix/bin/python3 ]; then \ ./google-cloud-sdk/platform/bundledpythonunix/bin/python3 -m pip install --no-cache-dir --upgrade \ cryptography==${GCLOUD_PYTHON_CRYPTOGRAPHY_VERSION} \ - wheel==${GCLOUD_PYTHON_WHEEL_VERSION} && \ + wheel==${GCLOUD_PYTHON_WHEEL_VERSION}; \ + fi && \ rm -f \ ./google-cloud-sdk/platform/gsutil/third_party/urllib3/dummyserver/certs/server.key \ ./google-cloud-sdk/platform/gsutil/third_party/urllib3/dummyserver/certs/cacert.key && \ From 7ad107cd6cde76ceaf8eccc0f1ffbce3af9d6a9d Mon Sep 17 00:00:00 2001 From: Dmitry Smirnov Date: Thu, 19 Mar 2026 21:25:31 +0300 Subject: [PATCH 2/2] Drop gcloud bundled Python upgrades --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c2ca711..d69a3ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,8 +8,6 @@ ARG AZURE_CLI_VERSION=2.84.0 ARG PIP_VERSION=25.3 ARG YQ_VERSION=4.52.4 ARG GCLOUD_VERSION=561.0.0 -ARG GCLOUD_PYTHON_CRYPTOGRAPHY_VERSION=46.0.5 -ARG GCLOUD_PYTHON_WHEEL_VERSION=0.46.2 # Set base environment variables ENV DEBIAN_FRONTEND=noninteractive \ @@ -96,11 +94,6 @@ RUN ARCH=$(uname -m) && \ fi && \ tar -xzf google-cloud-sdk.tar.gz && \ ./google-cloud-sdk/install.sh -q && \ - if [ -x ./google-cloud-sdk/platform/bundledpythonunix/bin/python3 ]; then \ - ./google-cloud-sdk/platform/bundledpythonunix/bin/python3 -m pip install --no-cache-dir --upgrade \ - cryptography==${GCLOUD_PYTHON_CRYPTOGRAPHY_VERSION} \ - wheel==${GCLOUD_PYTHON_WHEEL_VERSION}; \ - fi && \ rm -f \ ./google-cloud-sdk/platform/gsutil/third_party/urllib3/dummyserver/certs/server.key \ ./google-cloud-sdk/platform/gsutil/third_party/urllib3/dummyserver/certs/cacert.key && \