From 9aa24de1df2156bb7e3a701eff162ea54f64bdef Mon Sep 17 00:00:00 2001 From: Holger Koser Date: Tue, 28 Jun 2022 16:17:17 +0200 Subject: [PATCH] Upgrade node version and alpine docker image (#1242) * upgrade node image * Remove leading zero in nodejs version --- Dockerfile | 4 ++-- backend/package.json | 2 +- backend/test/docker.spec.js | 16 ++++++++-------- charts/package.json | 2 +- constraints.pro | 2 +- frontend/package.json | 2 +- package.json | 2 +- packages/kube-client/package.json | 2 +- packages/kube-config/package.json | 2 +- packages/logger/package.json | 2 +- packages/request/package.json | 2 +- packages/test-utils/package.json | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Dockerfile b/Dockerfile index fc1f71dcea..1102fb2970 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 #### Builder #### -FROM node:16-alpine3.15 as builder +FROM node:18-alpine3.16 as builder WORKDIR /usr/src/app @@ -47,7 +47,7 @@ RUN cp -r frontend/dist /usr/src/build/public \ && find /usr/src/build/.yarn -mindepth 1 -name cache -prune -o -exec rm -rf {} + #### Release #### -FROM alpine:3.15 as release +FROM alpine:3.16 as release RUN addgroup -g 1000 node && adduser -u 1000 -G node -s /bin/sh -D node RUN apk add --no-cache tini libstdc++ diff --git a/backend/package.json b/backend/package.json index 19cdbf7715..a436cba39c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -149,6 +149,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/backend/test/docker.spec.js b/backend/test/docker.spec.js index c4aa80b16a..4c4eb56bfa 100644 --- a/backend/test/docker.spec.js +++ b/backend/test/docker.spec.js @@ -19,17 +19,17 @@ const client = extend({ /* Nodejs release schedule (see https://nodejs.org/en/about/releases/) */ const activeNodeReleases = { - 12: { - endOfLife: new Date('2022-04-01T23:59:59Z') + 16: { + endOfLife: new Date('2023-09-11T23:59:59Z') }, - 14: { - endOfLife: new Date('2023-04-01T23:59:59Z') + 18: { + endOfLife: new Date('2025-04-30T23:59:59Z') }, - 15: { - endOfLife: new Date('2021-06-01T23:59:59Z') + 19: { + endOfLife: new Date('2023-06-01T23:59:59Z') }, - 16: { - endOfLife: new Date('2024-04-30T23:59:59Z') + 20: { + endOfLife: new Date('2026-04-30T23:59:59Z') } } diff --git a/charts/package.json b/charts/package.json index 45ea41a4fa..67415ede52 100644 --- a/charts/package.json +++ b/charts/package.json @@ -64,6 +64,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/constraints.pro b/constraints.pro index 3e4caf5c90..aa243ab474 100644 --- a/constraints.pro +++ b/constraints.pro @@ -20,7 +20,7 @@ gen_enforced_dependency(WorkspaceCwd, DependencyIdent, 'workspace:*', Dependency gen_enforced_field(WorkspaceCwd, 'license', 'Apache-2.0'). % This rule will enforce that all packages must have certain engines fields -gen_enforced_field(WorkspaceCwd, 'engines.node', '^16.15.0'). +gen_enforced_field(WorkspaceCwd, 'engines.node', '^18.4.0'). gen_enforced_field(WorkspaceCwd, 'packageManager', 'yarn@3.2.1'). % Required to make the package work with the GitHub Package Registry diff --git a/frontend/package.json b/frontend/package.json index e4c0a4e76e..a0b1dafc1a 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -101,6 +101,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/package.json b/package.json index 9394db4937..5c6ee8058d 100644 --- a/package.json +++ b/package.json @@ -34,6 +34,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/packages/kube-client/package.json b/packages/kube-client/package.json index c72aa68878..d73f46ea48 100644 --- a/packages/kube-client/package.json +++ b/packages/kube-client/package.json @@ -91,6 +91,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/packages/kube-config/package.json b/packages/kube-config/package.json index a9be932fc4..26a14bc969 100644 --- a/packages/kube-config/package.json +++ b/packages/kube-config/package.json @@ -70,6 +70,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/packages/logger/package.json b/packages/logger/package.json index 3b25f3e46b..8d2d4e81ca 100644 --- a/packages/logger/package.json +++ b/packages/logger/package.json @@ -72,6 +72,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/packages/request/package.json b/packages/request/package.json index 882349f59f..282d99283f 100644 --- a/packages/request/package.json +++ b/packages/request/package.json @@ -85,6 +85,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } } diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index e93adcad52..e99e58102a 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -43,6 +43,6 @@ }, "packageManager": "yarn@3.2.1", "engines": { - "node": "^16.15.0" + "node": "^18.4.0" } }