Skip to content

Commit

Permalink
Use node.js 20
Browse files Browse the repository at this point in the history
Node 18 is EoL soon, so let's switch to using node 20 by default.

Signed-off-by: Marc Dumais <marc.dumais@ericsson.com>
  • Loading branch information
marcdumais-work committed Feb 7, 2025
1 parent 70460a7 commit f6232c4
Show file tree
Hide file tree
Showing 6 changed files with 66 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-example.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: "tave"
resources-folder: "theia-app-vscode-ext"
os: [ubuntu-latest]
node-version: [18]
node-version: [20]

steps:
- uses: actions/checkout@v4
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile-tate
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.20.4-bookworm-slim AS build
FROM node:20.18.2-bookworm-slim AS build
ARG RESOURCES

RUN apt-get update && apt-get install -y \
Expand All @@ -25,7 +25,7 @@ RUN yarn && \
yarn --production && \
yarn cache clean

FROM node:18.19.1-bookworm-slim
FROM node:20.18.2-bookworm-slim
ARG RESOURCES

COPY --from=build /app/tv /app/tv
Expand Down
4 changes: 2 additions & 2 deletions docker/Dockerfile-tave
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:18.20.4-bookworm-slim AS build
FROM node:20.18.2-bookworm-slim AS build
ARG RESOURCES

RUN apt-get update && apt-get install -y \
Expand Down Expand Up @@ -27,7 +27,7 @@ RUN yarn && \
yarn --production && \
yarn cache clean

FROM node:18.19.1-bookworm-slim
FROM node:20.18.2-bookworm-slim
ARG RESOURCES

COPY --from=build /app/tv /app/tv
Expand Down
59 changes: 59 additions & 0 deletions docker/diff.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
diff --git a/.github/workflows/docker-example.yml b/.github/workflows/docker-example.yml
index 94fa5b6..c519e15 100644
--- a/.github/workflows/docker-example.yml
+++ b/.github/workflows/docker-example.yml
@@ -21,7 +21,7 @@ jobs:
- name: "tave"
resources-folder: "theia-app-vscode-ext"
os: [ubuntu-latest]
- node-version: [18]
+ node-version: [20]

steps:
- uses: actions/checkout@v4
diff --git a/docker/Dockerfile-tate b/docker/Dockerfile-tate
index 01996da..b31661e 100644
--- a/docker/Dockerfile-tate
+++ b/docker/Dockerfile-tate
@@ -1,4 +1,4 @@
-FROM node:18.20.4-bookworm-slim AS build
+FROM node:20.18.2-bookworm-slim AS build
ARG RESOURCES

RUN apt-get update && apt-get install -y \
diff --git a/docker/Dockerfile-tave b/docker/Dockerfile-tave
index c362b2b..88567e2 100644
--- a/docker/Dockerfile-tave
+++ b/docker/Dockerfile-tave
@@ -1,4 +1,4 @@
-FROM node:18.20.4-bookworm-slim AS build
+FROM node:20.18.2-bookworm-slim AS build
ARG RESOURCES

RUN apt-get update && apt-get install -y \
diff --git a/docker/theia-app-theia-ext/package.json b/docker/theia-app-theia-ext/package.json
index b0aba80..ab7a1a5 100644
--- a/docker/theia-app-theia-ext/package.json
+++ b/docker/theia-app-theia-ext/package.json
@@ -37,7 +37,7 @@
},
"engines": {
"yarn": ">=1.7.0 <2",
- "node": ">=18 <21"
+ "node": ">=18 <23"
},
"resolutions": {

diff --git a/docker/theia-app-vscode-ext/package.json b/docker/theia-app-vscode-ext/package.json
index 48aeaf4..26b2de2 100644
--- a/docker/theia-app-vscode-ext/package.json
+++ b/docker/theia-app-vscode-ext/package.json
@@ -39,7 +39,7 @@
},
"engines": {
"yarn": ">=1.7.0 <2",
- "node": ">=18 <21"
+ "node": ">=18 <23"
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
2 changes: 1 addition & 1 deletion docker/theia-app-theia-ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
},
"engines": {
"yarn": ">=1.7.0 <2",
"node": ">=18 <21"
"node": ">=18 <23"
},
"resolutions": {

Expand Down
2 changes: 1 addition & 1 deletion docker/theia-app-vscode-ext/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
},
"engines": {
"yarn": ">=1.7.0 <2",
"node": ">=18 <21"
"node": ">=18 <23"
},
"theiaPluginsDir": "plugins",
"theiaPlugins": {
Expand Down

0 comments on commit f6232c4

Please # to comment.