From 13e6081135fe176079ed28616eef90dd3cb2a058 Mon Sep 17 00:00:00 2001 From: Quentin Gliech Date: Fri, 30 Aug 2024 19:20:26 +0200 Subject: [PATCH] docker: remove redundant target platform --- Dockerfile | 4 ++-- tools/syn2mas/Dockerfile | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1ba4ea027..d43030b02 100644 --- a/Dockerfile +++ b/Dockerfile @@ -173,7 +173,7 @@ COPY ./translations/ /share/translations ################################## ## Runtime stage, debug variant ## ################################## -FROM --platform=${TARGETPLATFORM} gcr.io/distroless/cc-debian${DEBIAN_VERSION}:debug-nonroot AS debug +FROM gcr.io/distroless/cc-debian${DEBIAN_VERSION}:debug-nonroot AS debug ARG TARGETARCH COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli @@ -185,7 +185,7 @@ ENTRYPOINT ["/usr/local/bin/mas-cli"] ################### ## Runtime stage ## ################### -FROM --platform=${TARGETPLATFORM} gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot +FROM gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot ARG TARGETARCH COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli diff --git a/tools/syn2mas/Dockerfile b/tools/syn2mas/Dockerfile index e804126e3..ff3594e51 100644 --- a/tools/syn2mas/Dockerfile +++ b/tools/syn2mas/Dockerfile @@ -19,9 +19,9 @@ COPY ./package.json ./package-lock.json ./ RUN sed -i '/"prepare"/d' package.json RUN --network=default \ npm ci \ - --target_arch=amd64 \ - --target_platform=linux \ - --omit=dev + --target_arch=amd64 \ + --target_platform=linux \ + --omit=dev WORKDIR /deps/amd64 @@ -30,13 +30,13 @@ COPY ./package.json ./package-lock.json ./ RUN sed -i '/"prepare"/d' package.json RUN --network=default \ npm ci \ - --target_arch=x64 \ - --target_platform=linux \ - --omit=dev + --target_arch=x64 \ + --target_platform=linux \ + --omit=dev # Runtime stage -FROM --platform=${TARGETPLATFORM} gcr.io/distroless/nodejs18-debian12:debug-nonroot +FROM gcr.io/distroless/nodejs18-debian12:debug-nonroot WORKDIR /syn2mas COPY ./package.json ./package-lock.json ./