From 96d55c9187492366696bedfbef91c366f84179d4 Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 12:29:04 +0300 Subject: [PATCH 1/7] refactor dockerfile --- .nvmrc | 2 +- Dockerfile | 20 ++++++++++---------- package.json | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.nvmrc b/.nvmrc index c12134b..517f386 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20.15.0 +v22.14.0 diff --git a/Dockerfile b/Dockerfile index ac0b230..9aa536c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ -FROM node:20.15.0-bookworm-slim AS base -RUN adduser --disabled-password -home /home/cfu -shell /bin/bash cfu -WORKDIR /root/cf-runtime -COPY package.json yarn.lock ./ +ARG NODE_VERSION=22.14.0 +FROM node:${NODE_VERSION}-bookworm-slim AS base +WORKDIR /app FROM base AS build-dependencies RUN apt-get update \ @@ -11,6 +10,7 @@ RUN apt-get update \ git \ make \ python3 +COPY package.json yarn.lock ./ FROM build-dependencies AS build RUN yarn install --frozen-lockfile @@ -20,12 +20,12 @@ RUN yarn build FROM build-dependencies AS prod-dependencies RUN yarn install --frozen-lockfile --production -FROM base AS production -COPY --from=prod-dependencies /root/cf-runtime/node_modules ./node_modules -COPY --from=build /root/cf-runtime/dist ./lib +FROM base AS final +# purpose of security +RUN npm uninstall -g --logs-max=0 corepack npm +USER node -#purpose of security -RUN npm -g uninstall npm +COPY --from=prod-dependencies --chown=node:node /app/node_modules node_modules +COPY --from=build --chown=node:node /app/dist lib -USER cfu CMD ["node", "lib/index.js"] diff --git a/package.json b/package.json index 7b087fb..e33fa70 100644 --- a/package.json +++ b/package.json @@ -44,7 +44,7 @@ "typescript": "^5.7.2" }, "engines": { - "node": ">=16.20.2 <=20" + "node": "^22.14.0" }, "scripts": { "lint": "eslint '*/**/*.{j,t}s'", From ae8d6418121eff3423d1e93cfcd1e6316f13692d Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 12:31:06 +0300 Subject: [PATCH 2/7] refactor dockerfile --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index ef2cb77..49752cf 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 1.12.2 +version: 1.12.3 From 13e073312bb8907fa815f07730d16fe3bada32cf Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 13:07:17 +0300 Subject: [PATCH 3/7] trigger CI From eb195191cfc5fc636d66694cd15d8d054f5b2fb3 Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 13:08:12 +0300 Subject: [PATCH 4/7] trigger CI From 239ae15dd3cbc6b82d27035a592cffecd6efea1d Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 13:38:26 +0300 Subject: [PATCH 5/7] trigger CI From 9528d7e54c5dce562ee3f13378de41639e61c0b5 Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 13:40:30 +0300 Subject: [PATCH 6/7] trigger CI From 9a3ef3a0272a3495560939cf4d4f50dd02c33e96 Mon Sep 17 00:00:00 2001 From: Vadim Gusev Date: Wed, 9 Apr 2025 13:43:58 +0300 Subject: [PATCH 7/7] trigger CI