From 2132cf3bdcc4bc58dd3656cbedac05957ff26897 Mon Sep 17 00:00:00 2001 From: zadam Date: Wed, 18 Oct 2023 09:40:00 +0200 Subject: [PATCH] nodejs 18.18.2 --- .gitpod.yml | 2 +- Dockerfile | 2 +- bin/build-server.sh | 2 +- bin/copy-trilium.sh | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 7c304f56a..65ce50015 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -2,7 +2,7 @@ image: file: .gitpod.dockerfile tasks: - - before: nvm install 18.18.0 && nvm use 18.18.0 + - before: nvm install 18.18.2 && nvm use 18.18.2 init: npm install command: npm run start-server diff --git a/Dockerfile b/Dockerfile index 85c17226d..d8cb9b0c3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # !!! Don't try to build this Dockerfile directly, run it through bin/build-docker.sh script !!! -FROM node:18.18.0-alpine +FROM node:18.18.2-alpine # Create app directory WORKDIR /usr/src/app diff --git a/bin/build-server.sh b/bin/build-server.sh index a3624814a..6299908c2 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash PKG_DIR=dist/trilium-linux-x64-server -NODE_VERSION=18.18.0 +NODE_VERSION=18.18.2 if [ "$1" != "DONTCOPY" ] then diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index c009d16a2..624defa90 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then exit 1 fi -n exec 18.18.0 npm run webpack +n exec 18.18.2 npm run webpack DIR=$1 @@ -27,7 +27,7 @@ cp -r electron.js $DIR/ cp webpack-* $DIR/ # run in subshell (so we return to original dir) -(cd $DIR && n exec 18.18.0 npm install --only=prod) +(cd $DIR && n exec 18.18.2 npm install --only=prod) # cleanup of useless files in dependencies rm -r $DIR/node_modules/image-q/demo