From 34eb2ffc4b0bf8fc7198931896f6175d2b8b1145 Mon Sep 17 00:00:00 2001 From: Masahiro Furudate <178inaba.git@gmail.com> Date: Fri, 23 May 2025 13:41:52 +0900 Subject: [PATCH 1/2] Fix FromAsCasing --- Dockerfile | 2 +- alpine/Dockerfile | 2 +- debian_component_based/Dockerfile | 2 +- debian_slim/Dockerfile | 2 +- stable/Dockerfile | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index f3b91521..d698de7b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:28.2.2 as static-docker-source +FROM docker:28.2.2 AS static-docker-source FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 7aa3b2a8..72600c97 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:28.2.2 as static-docker-source +FROM docker:28.2.2 AS static-docker-source FROM alpine:3.22 ARG CLOUD_SDK_VERSION diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile index ae6b57db..200217d1 100644 --- a/debian_component_based/Dockerfile +++ b/debian_component_based/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:28.2.2 as static-docker-source +FROM docker:28.2.2 AS static-docker-source FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION diff --git a/debian_slim/Dockerfile b/debian_slim/Dockerfile index 5430ac60..23d33894 100644 --- a/debian_slim/Dockerfile +++ b/debian_slim/Dockerfile @@ -1,4 +1,4 @@ -FROM docker:28.2.2 as static-docker-source +FROM docker:28.2.2 AS static-docker-source FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION diff --git a/stable/Dockerfile b/stable/Dockerfile index c2242c4b..957eee6f 100644 --- a/stable/Dockerfile +++ b/stable/Dockerfile @@ -1,4 +1,4 @@ -FROM marketplace.gcr.io/google/debian12:latest as build_image +FROM marketplace.gcr.io/google/debian12:latest AS build_image ARG CLOUD_SDK_VERSION ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION @@ -18,7 +18,7 @@ RUN apt-get update -qqy && apt-get -qqy upgrade && \ rm -rf /root/.cache/pip/ && \ find /usr/lib/google-cloud-sdk -name '*.pyc' -delete && \ find /usr/lib/google-cloud-sdk -name '*__pycache__*' -delete -FROM marketplace.gcr.io/google/debian12:latest as runtime_image +FROM marketplace.gcr.io/google/debian12:latest AS runtime_image COPY --from=build_image /usr/lib/google-cloud-sdk /usr/lib/google-cloud-sdk ENV PATH=$PATH:/usr/lib/google-cloud-sdk/bin From 65bafeaf74e28d5b36999709f25101e3f07b3063 Mon Sep 17 00:00:00 2001 From: Masahiro Furudate <178inaba.git@gmail.com> Date: Fri, 23 May 2025 13:45:16 +0900 Subject: [PATCH 2/2] Fix LegacyKeyValueFormat --- all_components/Dockerfile | 2 +- alpine/Dockerfile | 2 +- debian_component_based/Dockerfile | 2 +- emulators/Dockerfile | 2 +- google_appengine_base/Dockerfile | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/all_components/Dockerfile b/all_components/Dockerfile index 6ad24b08..b6002557 100644 --- a/all_components/Dockerfile +++ b/all_components/Dockerfile @@ -1,7 +1,7 @@ FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION -ENV PATH /google-cloud-sdk/bin:$PATH +ENV PATH=/google-cloud-sdk/bin:$PATH RUN groupadd -r -g 1000 cloudsdk && \ useradd -r -u 1000 -m -s /bin/bash -g cloudsdk cloudsdk RUN apt-get update -qqy && apt-get -qqy upgrade && apt-get install -qqy \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 72600c97..c771a10a 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -3,7 +3,7 @@ FROM docker:28.2.2 AS static-docker-source FROM alpine:3.22 ARG CLOUD_SDK_VERSION ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION -ENV PATH /google-cloud-sdk/bin:$PATH +ENV PATH=/google-cloud-sdk/bin:$PATH COPY --from=static-docker-source /usr/local/bin/docker /usr/local/bin/docker RUN addgroup -g 1000 -S cloudsdk && \ adduser -u 1000 -S cloudsdk -G cloudsdk diff --git a/debian_component_based/Dockerfile b/debian_component_based/Dockerfile index 200217d1..2d9febe7 100644 --- a/debian_component_based/Dockerfile +++ b/debian_component_based/Dockerfile @@ -3,7 +3,7 @@ FROM docker:28.2.2 AS static-docker-source FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION -ENV PATH /google-cloud-sdk/bin:$PATH +ENV PATH=/google-cloud-sdk/bin:$PATH COPY --from=static-docker-source /usr/local/bin/docker /usr/local/bin/docker RUN groupadd -r -g 1000 cloudsdk && \ useradd -r -u 1000 -m -s /bin/bash -g cloudsdk cloudsdk diff --git a/emulators/Dockerfile b/emulators/Dockerfile index c40c271a..efc6ae99 100644 --- a/emulators/Dockerfile +++ b/emulators/Dockerfile @@ -3,7 +3,7 @@ FROM marketplace.gcr.io/google/debian12:latest ARG CLOUD_SDK_VERSION ENV CLOUD_SDK_VERSION=$CLOUD_SDK_VERSION -ENV PATH /google-cloud-sdk/bin:$PATH +ENV PATH=/google-cloud-sdk/bin:$PATH RUN groupadd -r -g 1000 cloudsdk && \ useradd -r -u 1000 -m -s /bin/bash -g cloudsdk cloudsdk diff --git a/google_appengine_base/Dockerfile b/google_appengine_base/Dockerfile index c719c764..a42ce710 100644 --- a/google_appengine_base/Dockerfile +++ b/google_appengine_base/Dockerfile @@ -1,12 +1,12 @@ FROM gcr.io/google_appengine/base # Prepare the image. -ENV DEBIAN_FRONTEND noninteractive +ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y -qq --no-install-recommends wget unzip python php5-mysql php5-cli php5-cgi openjdk-7-jre-headless openssh-client python-openssl && apt-get clean # Install the Google Cloud SDK. -ENV HOME / -ENV CLOUDSDK_PYTHON_SITEPACKAGES 1 +ENV HOME=/ +ENV CLOUDSDK_PYTHON_SITEPACKAGES=1 RUN wget https://dl.google.com/dl/cloudsdk/channels/rapid/google-cloud-sdk.zip && unzip google-cloud-sdk.zip && rm google-cloud-sdk.zip RUN google-cloud-sdk/install.sh --usage-reporting=true --path-update=true --bash-completion=true --rc-path=/.bashrc --additional-components app-engine-java app-engine-python app kubectl alpha beta gcd-emulator pubsub-emulator cloud-datastore-emulator app-engine-go bigtable @@ -22,6 +22,6 @@ RUN sed -i -- 's/\"disable_updater\": false/\"disable_updater\": true/g' /google RUN mkdir /.ssh -ENV PATH /google-cloud-sdk/bin:$PATH +ENV PATH=/google-cloud-sdk/bin:$PATH VOLUME ["/.config"] CMD ["/bin/bash"]