Merge pull request #634 from Jocke4f/fix_603_replace_bcrypt_with_bcry…

…ptjs Replacing bcrypt with bcryptjs
josephdadams · Jan 20, 2024 · e3ac510 · e3ac510
2 parents 1cce951 + c7670e3
commit e3ac510
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 528 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -1,6 +1,6 @@
 tasks:
   - name: Server
-    init: npm i -g npm redundancyjs; cd UI; npm i --ignore-scripts; npm run build; cd ..; npm i --ignore-scripts; npm rebuild bcrypt; gp sync-done server
+    init: npm i -g npm redundancyjs; cd UI; npm i --ignore-scripts; npm run build; cd ..; npm i --ignore-scripts; gp sync-done server
     command: npm start
   - name: Angular serve
     init: gp sync-await server

diff --git a/Dockerfile b/Dockerfile
@@ -7,8 +7,8 @@ RUN apk add --update nodejs npm \
     && apk add --no-cache --virtual .build-deps alpine-sdk python3 \
     && npm install node-gyp -g \
     && npm i --ignore-script --omit=dev \
-    && npm uninstall bcrypt \
-    && npm install bcrypt \
+    && npm uninstall bcryptjs \
+    && npm install bcryptjs \
     && npm uninstall node-gyp -g \
     && apk del .build-deps