瀏覽代碼

fix(bash): change to bcryptjs

gemercheung 3 年之前
父節點
當前提交
0bb335077a
共有 4 個文件被更改,包括 13 次插入7 次删除
  1. 0 5
      Dockerfile
  2. 11 0
      package-lock.json
  3. 1 1
      package.json
  4. 1 1
      src/core/io.js

+ 0 - 5
Dockerfile

@@ -3,11 +3,6 @@ FROM node:gallium-alpine3.15
 WORKDIR /usr/src/app
 
 COPY . .
-RUN apk add --no-cache make gcc g++ python && \
-    npm install && \
-    npm rebuild bcrypt --build-from-source && \
-    apk del make gcc g++ python
-
 RUN npm config set registry https://registry.npmmirror.com/
 RUN npm install -g npm
 RUN npm install

+ 11 - 0
package-lock.json

@@ -14,6 +14,7 @@
         "@socket.io/redis-adapter": "^7.1.0",
         "@socket.io/sticky": "^1.0.1",
         "bcrypt": "^5.0.1",
+        "bcryptjs": "^2.4.3",
         "dotenv-flow": "^3.2.0",
         "eiows": "^3.7.3",
         "engine.io": "^6.1.2",
@@ -335,6 +336,11 @@
         "node": ">= 10.0.0"
       }
     },
+    "node_modules/bcryptjs": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmmirror.com/bcryptjs/-/bcryptjs-2.4.3.tgz",
+      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
+    },
     "node_modules/brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -2021,6 +2027,11 @@
         "node-addon-api": "^3.1.0"
       }
     },
+    "bcryptjs": {
+      "version": "2.4.3",
+      "resolved": "https://registry.npmmirror.com/bcryptjs/-/bcryptjs-2.4.3.tgz",
+      "integrity": "sha512-V/Hy/X9Vt7f3BbPJEi8BdVFMByHi+jNXrYkW3huaybV/kQ0KJg0Y6PkEMbn+zeT+i+SiKZ/HMqJGIIt4LZDqNQ=="
+    },
     "brace-expansion": {
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",

+ 1 - 1
package.json

@@ -16,7 +16,7 @@
     "@socket.io/cluster-adapter": "^0.1.0",
     "@socket.io/redis-adapter": "^7.1.0",
     "@socket.io/sticky": "^1.0.1",
-    "bcrypt": "^5.0.1",
+    "bcryptjs": "^2.4.3",
     "dotenv-flow": "^3.2.0",
     "eiows": "^3.7.3",
     "engine.io": "^6.1.2",

+ 1 - 1
src/core/io.js

@@ -1,5 +1,5 @@
 import http from "http";
-import bcrypt from "bcrypt";
+import bcrypt from "bcryptjs";
 import { Server } from "socket.io";
 import { instrument, RedisStore } from "@socket.io/admin-ui";
 import { createAdapter } from "@socket.io/redis-adapter";