letro/letro-authentication-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

docker: remove redundant target platform

Browse Source
This commit is contained in:
Quentin Gliech
2024-08-30 19:20:26 +02:00
parent 52cc254cb6
commit 5656c56322
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -173,7 +173,7 @@ COPY ./translations/ /share/translations
################################## ##################################
## Runtime stage, debug variant ## ## 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 ARG TARGETARCH
COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli 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 ## ## Runtime stage ##
################### ###################
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot FROM gcr.io/distroless/cc-debian${DEBIAN_VERSION}:nonroot
ARG TARGETARCH ARG TARGETARCH
COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli COPY --from=builder /usr/local/bin/mas-cli-${TARGETARCH} /usr/local/bin/mas-cli

14
tools/syn2mas/Dockerfile
View File

@@ -19,9 +19,9 @@ COPY ./package.json ./package-lock.json ./
RUN sed -i '/"prepare"/d' package.json RUN sed -i '/"prepare"/d' package.json
RUN --network=default \ RUN --network=default \
npm ci \ npm ci \
--target_arch=amd64 \ --target_arch=amd64 \
--target_platform=linux \ --target_platform=linux \
--omit=dev --omit=dev
WORKDIR /deps/amd64 WORKDIR /deps/amd64
@@ -30,13 +30,13 @@ COPY ./package.json ./package-lock.json ./
RUN sed -i '/"prepare"/d' package.json RUN sed -i '/"prepare"/d' package.json
RUN --network=default \ RUN --network=default \
npm ci \ npm ci \
--target_arch=x64 \ --target_arch=x64 \
--target_platform=linux \ --target_platform=linux \
--omit=dev --omit=dev
# Runtime stage # Runtime stage
FROM --platform=${TARGETPLATFORM} gcr.io/distroless/nodejs18-debian12:debug-nonroot FROM gcr.io/distroless/nodejs18-debian12:debug-nonroot
WORKDIR /syn2mas WORKDIR /syn2mas
COPY ./package.json ./package-lock.json ./ COPY ./package.json ./package-lock.json ./