From e13c50be7c2e9d1118d813a531de04f46516c9f7 Mon Sep 17 00:00:00 2001 From: dyedwiper Date: Fri, 8 Nov 2024 10:04:10 +0100 Subject: [PATCH 1/5] Raise node version in engines spec --- package-lock.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 79952875444..c0ccab39c35 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,7 +224,7 @@ "typescript": "^5.5.4" }, "engines": { - "node": "20", + "node": "22", "npm": ">=9" } }, diff --git a/package.json b/package.json index 37f044e9f3e..1159b4954ad 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "contributors": [], "bugs": {}, "engines": { - "node": "20", + "node": "22", "npm": ">=9" }, "mikro-orm": { From 0632d9452a6d773ea632bf97bbe897152ed6cf96 Mon Sep 17 00:00:00 2001 From: dyedwiper Date: Fri, 8 Nov 2024 10:08:19 +0100 Subject: [PATCH 2/5] Raise node version in nvmrc --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 209e3ef4b62..2bd5a0a98a3 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20 +22 From 7fef661c27f1bec909ec95b771cbd03ccb94c6d8 Mon Sep 17 00:00:00 2001 From: dyedwiper Date: Fri, 8 Nov 2024 10:08:31 +0100 Subject: [PATCH 3/5] Raise node version in Dockerfile --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9871502c55a..98a1f7fb8f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,11 +1,11 @@ -FROM docker.io/node:20 AS git +FROM docker.io/node:22 AS git RUN mkdir /app && chown -R node:node /app WORKDIR /app COPY .git . RUN git config --global --add safe.directory /app && echo "{\"sha\": \"$(git rev-parse HEAD)\", \"version\": \"$(git describe --tags --abbrev=0)\", \"commitDate\": \"$(git log -1 --format=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ')\", \"birthdate\": \"$(date +%Y-%m-%dT%H:%M:%SZ)\"}" > /app/serverversion -FROM docker.io/node:20-alpine +FROM docker.io/node:22-alpine ENV TZ=Europe/Berlin RUN apk add --no-cache git make python3 # to run ldap sync as script curl is needed From c22afa361950aa4c70f9f52ab4409eadc3553a76 Mon Sep 17 00:00:00 2001 From: dyedwiper Date: Fri, 8 Nov 2024 10:08:48 +0100 Subject: [PATCH 4/5] Raise node version in github workflows --- .github/workflows/migrations.yml | 2 +- .github/workflows/test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/migrations.yml b/.github/workflows/migrations.yml index 2909e518efe..2ac22d7b42e 100644 --- a/.github/workflows/migrations.yml +++ b/.github/workflows/migrations.yml @@ -12,7 +12,7 @@ on: env: MONGODB_VERSION: 6.0 - NODE_VERSION: '20' + NODE_VERSION: '22' jobs: migration: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c6508edb8a0..602c75ad958 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,7 +12,7 @@ permissions: env: MONGODB_VERSION: 6.0 - NODE_VERSION: '20' + NODE_VERSION: '22' jobs: feathers_tests_cov: runs-on: ubuntu-latest From 9f4293caaf1a0e3c42e0adf428d94e6eb7060809 Mon Sep 17 00:00:00 2001 From: dyedwiper Date: Mon, 18 Nov 2024 14:37:13 +0100 Subject: [PATCH 5/5] Use npm ci instead of npm i in api-init-job --- .../schulcloud-server-init/templates/configmap_file_init.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2 b/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2 index 0d3fbd01792..0e0b3f82225 100644 --- a/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2 +++ b/ansible/roles/schulcloud-server-init/templates/configmap_file_init.yml.j2 @@ -12,7 +12,7 @@ data: git clone https://github.com/hpi-schul-cloud/schulcloud-server.git cd /schulcloud-server git checkout {{ SCHULCLOUD_SERVER_IMAGE_TAG }} - npm install + npm ci until mongosh $DATABASE__URL --eval "print(\"waited for connection\")" do sleep 1