From 08de05cc0ce9f9d5775d54b1db23e0d29bd8a5f3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 17 Nov 2022 06:04:09 +0000 Subject: [PATCH 1/8] Bump node from 16.18.0-alpine to 19.1.0-alpine Bumps node from 16.18.0-alpine to 19.1.0-alpine. --- updated-dependencies: - dependency-name: node dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Dockerfile | 2 +- Dockerfile.openapi_decorator | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8d08126b7a88..b97f01b49f4b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # -------------------------------------------------------------------------------- # BASE IMAGE # -------------------------------------------------------------------------------- -FROM node:16.18.0-alpine@sha256:f16544bc93cf1a36d213c8e2efecf682e9f4df28429a629a37aaf38ecfc25cf4 as base +FROM node:19.1.0-alpine@sha256:c59fb39150e4a7ae14dfd42d3f9874398c7941784b73049c2d274115f00d36c8 as base # This directory is owned by the node user ARG APP_HOME=/home/node/app diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator index 6014681b41da..790a00ddbbf4 100644 --- a/Dockerfile.openapi_decorator +++ b/Dockerfile.openapi_decorator @@ -1,4 +1,4 @@ -FROM node:14-alpine +FROM node:19-alpine RUN apk add --no-cache git python make g++ From e6782220950ac01fc1d7dd83d462da348f8b66db Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:24:14 -0500 Subject: [PATCH 2/8] Update Dockerfile.openapi_decorator --- Dockerfile.openapi_decorator | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator index 790a00ddbbf4..f3744c11203d 100644 --- a/Dockerfile.openapi_decorator +++ b/Dockerfile.openapi_decorator @@ -11,10 +11,22 @@ USER node COPY --chown=node:node package.json /openapi-check COPY --chown=node:node package-lock.json /openapi-check ADD --chown=node:node script /openapi-check/script -ADD --chown=node:node lib /openapi-check/lib +ADD --chown=node:node lib/openapi-check/lib ADD --chown=node:node content /openapi-check/content ADD --chown=node:node data /openapi-check/data RUN npm ci -D ENTRYPOINT ["node", "/openapi-check/script/rest/openapi-check.js"] +FROM node:19-alpine + +RUN apk add --no-cache git python make g++ + +WORKDIR /openapi-check + +RUN chown node:node /openapi-check -R + +USER node + +COPY --chown=node:node package.json /openapi-check +COPY \ No newline at end of file From 093efa6e64b9e05c8f50c54203392ffcb0bf6551 Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:28:27 -0500 Subject: [PATCH 3/8] Update Dockerfile.openapi_decorator --- Dockerfile.openapi_decorator | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator index f3744c11203d..02a2f36f6215 100644 --- a/Dockerfile.openapi_decorator +++ b/Dockerfile.openapi_decorator @@ -29,4 +29,15 @@ RUN chown node:node /openapi-check -R USER node COPY --chown=node:node package.json /openapi-check -COPY \ No newline at end of file +COPY FROM node:19-alpine + +RUN apk add --no-cache git python make g++ + +WORKDIR /openapi-check + +RUN chown node:node /openapi-check -R + +USER node + +COPY --chown=node:node package.json /openapi-check +COPY --cho \ No newline at end of file From 23e999ad1aa17c724eaf1a159c41418c8fc11497 Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:30:41 -0500 Subject: [PATCH 4/8] Update Dockerfile.openapi_decorator --- Dockerfile.openapi_decorator | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator index 02a2f36f6215..335c2e1e107a 100644 --- a/Dockerfile.openapi_decorator +++ b/Dockerfile.openapi_decorator @@ -18,7 +18,7 @@ ADD --chown=node:node data /openapi-check/data RUN npm ci -D ENTRYPOINT ["node", "/openapi-check/script/rest/openapi-check.js"] -FROM node:19-alpine +FROM node: 19-alpine RUN apk add --no-cache git python make g++ From 4b0c4e18009cc593f2b35595481d6bdc6a344d30 Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:35:50 -0500 Subject: [PATCH 5/8] Update Dockerfile --- Dockerfile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Dockerfile b/Dockerfile index b97f01b49f4b..99af448a42c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -103,3 +103,7 @@ FROM preview as production # Copy in all translations COPY --chown=node:node translations ./translations +# This Dockerfile is used for docker-based deployments to Azure for both preview environments and production + +# -------------------------------------------------------------------------------- +# BASE \ No newline at end of file From c9b558402ff36d9cfe5b72f391cc37bbcc5c8ec9 Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:46:14 -0500 Subject: [PATCH 6/8] Update Dockerfile.openapi_decorator --- Dockerfile.openapi_decorator | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Dockerfile.openapi_decorator b/Dockerfile.openapi_decorator index 335c2e1e107a..0d920faffacc 100644 --- a/Dockerfile.openapi_decorator +++ b/Dockerfile.openapi_decorator @@ -39,5 +39,16 @@ RUN chown node:node /openapi-check -R USER node +COPY --chown=node:node package.json /openapi-check +COPY --cho FROM node:19-alpine + +RUN apk add --no-cache git python make g++ + +WORKDIR /openapi-check + +RUN chown node:node /openapi-check -R + +USER node + COPY --chown=node:node package.json /openapi-check COPY --cho \ No newline at end of file From a4359137a0ec9e1d689a4b072595008e199dd168 Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:47:39 -0500 Subject: [PATCH 7/8] Update Dockerfile --- Dockerfile | 105 ----------------------------------------------------- 1 file changed, 105 deletions(-) diff --git a/Dockerfile b/Dockerfile index 99af448a42c3..995e60935418 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,109 +1,4 @@ # This Dockerfile is used for docker-based deployments to Azure for both preview environments and production -# -------------------------------------------------------------------------------- -# BASE IMAGE -# -------------------------------------------------------------------------------- -FROM node:19.1.0-alpine@sha256:c59fb39150e4a7ae14dfd42d3f9874398c7941784b73049c2d274115f00d36c8 as base - -# This directory is owned by the node user -ARG APP_HOME=/home/node/app - -# Make sure we don't run anything as the root user -USER node - -WORKDIR $APP_HOME - - -# --------------- -# ALL DEPS -# --------------- -FROM base as all_deps - -COPY --chown=node:node package.json package-lock.json ./ - -RUN npm ci --no-optional --registry https://registry.npmjs.org/ - -# For Next.js v12+ -# This the appropriate necessary extra for node:16-alpine -# Other options are https://www.npmjs.com/search?q=%40next%2Fswc -RUN npm i @next/swc-linux-x64-musl --no-save - - -# --------------- -# PROD DEPS -# --------------- -FROM all_deps as prod_deps - -RUN npm prune --production - - -# --------------- -# BUILDER -# --------------- -FROM all_deps as builder - -COPY stylesheets ./stylesheets -COPY pages ./pages -COPY components ./components -COPY lib ./lib -# Certain content is necessary for being able to build -COPY content/index.md ./content/index.md -COPY content/rest ./content/rest -COPY data ./data - -COPY next.config.js ./next.config.js -COPY tsconfig.json ./tsconfig.json - -RUN npm run build - -# -------------------------------------------------------------------------------- -# PREVIEW IMAGE - no translations -# -------------------------------------------------------------------------------- - -FROM base as preview - -# Copy just prod dependencies -COPY --chown=node:node --from=prod_deps $APP_HOME/node_modules $APP_HOME/node_modules - -# Copy our front-end code -COPY --chown=node:node --from=builder $APP_HOME/.next $APP_HOME/.next - -# We should always be running in production mode -ENV NODE_ENV production - -# Preferred port for server.js -ENV PORT 4000 - -ENV ENABLED_LANGUAGES "en" - -# This makes it possible to set `--build-arg BUILD_SHA=abc123` -# and it then becomes available as an environment variable in the docker run. -ARG BUILD_SHA -ENV BUILD_SHA=$BUILD_SHA - -# Copy only what's needed to run the server -COPY --chown=node:node package.json ./ -COPY --chown=node:node assets ./assets -COPY --chown=node:node content ./content -COPY --chown=node:node lib ./lib -COPY --chown=node:node middleware ./middleware -COPY --chown=node:node data ./data -COPY --chown=node:node next.config.js ./ -COPY --chown=node:node server.js ./server.js -COPY --chown=node:node start-server.js ./start-server.js - -EXPOSE $PORT - -CMD ["node", "server.js"] - -# -------------------------------------------------------------------------------- -# PRODUCTION IMAGE - includes all translations -# -------------------------------------------------------------------------------- -FROM preview as production - -# Copy in all translations -COPY --chown=node:node translations ./translations -# This Dockerfile is used for docker-based deployments to Azure for both preview environments and production - # -------------------------------------------------------------------------------- # BASE \ No newline at end of file From a136345f097a48cd5a1ca7ddb161d4a09db4f7fc Mon Sep 17 00:00:00 2001 From: Jasonw74 Date: Sat, 15 Mar 2025 10:49:38 -0500 Subject: [PATCH 8/8] Update Dockerfile --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index 995e60935418..015373400758 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,7 @@ # This Dockerfile is used for docker-based deployments to Azure for both preview environments and production +# -------------------------------------------------------------------------------- +# BASE # This Dockerfile is used for docker-based deployments to Azure for both preview environments and production + # -------------------------------------------------------------------------------- # BASE \ No newline at end of file