diff --git a/Dockerfile b/Dockerfile index fcb05cce..efae20b0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,11 +12,14 @@ ENTRYPOINT [ "tini", "--" ] # Create app directory WORKDIR ${APP_HOME} +# Set NODE_ENV to production +ENV NODE_ENV=production + # Install app dependencies COPY package*.json post-install.js ./ RUN \ echo "*** Install npm packages ***" && \ - npm install && npm cache clean --force + npm i --no-audit --no-fund --quiet --omit=dev && npm cache clean --force # Bundle app source COPY . ./ diff --git a/Start.bat b/Start.bat index b0758672..8bd3a7e0 100644 --- a/Start.bat +++ b/Start.bat @@ -1,5 +1,6 @@ pushd %~dp0 -call npm install --no-audit +set NODE_ENV=production +call npm install --no-audit --no-fund --quiet --omit=dev node server.js %* pause popd diff --git a/UpdateAndStart.bat b/UpdateAndStart.bat index 67339ba5..110122cf 100644 --- a/UpdateAndStart.bat +++ b/UpdateAndStart.bat @@ -11,7 +11,8 @@ if %errorlevel% neq 0 ( echo There were errors while updating. Please download the latest version manually. ) ) -call npm install +set NODE_ENV=production +call npm install --no-audit --no-fund --quiet --omit=dev node server.js %* pause popd diff --git a/server.js b/server.js index 04b2ade5..9d6557bb 100644 --- a/server.js +++ b/server.js @@ -93,8 +93,8 @@ const cliArguments = yargs(hideBin(process.argv)) }).parseSync(); // change all relative paths -const serverDirectory = process['pkg'] ? path.dirname(process.execPath) : __dirname; -console.log(process['pkg'] ? 'Running from binary' : 'Running from source'); +console.log(`Running in ${process.env.NODE_ENV} environment`); +const serverDirectory = __dirname; process.chdir(serverDirectory); const app = express(); diff --git a/start.sh b/start.sh index a88bc42d..4b96b1c3 100755 --- a/start.sh +++ b/start.sh @@ -28,7 +28,8 @@ if [ ! -z "$REPL_ID" ]; then fi echo "Installing Node Modules..." -npm i --no-audit +export NODE_ENV=production +npm i --no-audit --no-fund --quiet --omit=dev echo "Entering SillyTavern..." node "$(dirname "$0")/server.js" "$@"