Merge branch 'release' into staging
| @@ -19,7 +19,7 @@ ENV NODE_ENV=production | |||
| 19 | COPY package*.json post-install.js ./ | 19 | COPY package*.json post-install.js ./ |
| 20 | RUN \ | 20 | RUN \ |
| 21 | echo "*** Install npm packages ***" && \ | 21 | echo "*** Install npm packages ***" && \ |
| 22 | npm i --no-audit --no-fund --quiet --omit=dev && npm cache clean --force | 22 | npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force |
| 23 | 23 | ||
| 24 | # Bundle app source | 24 | # Bundle app source |
| 25 | COPY . ./ | 25 | COPY . ./ |
| @@ -1,7 +1,7 @@ | |||
| 1 | @echo off | 1 | @echo off |
| 2 | pushd %~dp0 | 2 | pushd %~dp0 |
| 3 | set NODE_ENV=production | 3 | set NODE_ENV=production |
| 4 | call npm install --no-audit --no-fund --quiet --omit=dev | 4 | call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev |
| 5 | node server.js %* | 5 | node server.js %* |
| 6 | pause | 6 | pause |
| 7 | popd | 7 | popd |
| @@ -12,7 +12,7 @@ if %errorlevel% neq 0 ( | |||
| 12 | ) | 12 | ) |
| 13 | ) | 13 | ) |
| 14 | set NODE_ENV=production | 14 | set NODE_ENV=production |
| 15 | call npm install --no-audit --no-fund --quiet --omit=dev | 15 | call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev |
| 16 | node server.js %* | 16 | node server.js %* |
| 17 | pause | 17 | pause |
| 18 | popd | 18 | popd |
| @@ -42,7 +42,7 @@ if NOT "!AUTO_SWITCH!"=="" ( | |||
| 42 | SET TARGET_BRANCH=release | 42 | SET TARGET_BRANCH=release |
| 43 | goto update | 43 | goto update |
| 44 | ) | 44 | ) |
| 45 | 45 | ||
| 46 | echo Auto-switching defined to stay on current branch | 46 | echo Auto-switching defined to stay on current branch |
| 47 | goto update | 47 | goto update |
| 48 | ) | 48 | ) |
| @@ -95,7 +95,7 @@ if %errorlevel% neq 0 ( | |||
| 95 | 95 | ||
| 96 | echo Installing npm packages and starting server | 96 | echo Installing npm packages and starting server |
| 97 | set NODE_ENV=production | 97 | set NODE_ENV=production |
| 98 | call npm install --no-audit --no-fund --quiet --omit=dev | 98 | call npm install --no-audit --no-fund --loglevel=error --no-progress --omit=dev |
| 99 | node server.js %* | 99 | node server.js %* |
| 100 | 100 | ||
| 101 | :end | 101 | :end |
| @@ -26,7 +26,7 @@ fi | |||
| 26 | 26 | ||
| 27 | echo "Installing Node Modules..." | 27 | echo "Installing Node Modules..." |
| 28 | export NODE_ENV=production | 28 | export NODE_ENV=production |
| 29 | npm i --no-audit --no-fund --quiet --omit=dev | 29 | npm i --no-audit --no-fund --loglevel=error --no-progress --omit=dev |
| 30 | 30 | ||
| 31 | echo "Entering SillyTavern..." | 31 | echo "Entering SillyTavern..." |
| 32 | node "server.js" "$@" | 32 | node "server.js" "$@" |