Merge pull request #1437 from long2ice/main

chore: update docker base image
merico-dev · Jun 6, 2024 · 3643a26 · 3643a26
2 parents e5d4c15 + a5e07cb
commit 3643a26
Show file tree

Hide file tree

Showing 4 changed files with 479 additions and 1,646 deletions.
diff --git a/Dockerfile-api b/Dockerfile-api
@@ -15,7 +15,7 @@ RUN yarn set version $YARN_VERSION
 RUN yarn config set nodeLinker node-modules
 RUN yarn install
 
-FROM registry.cn-hongkong.aliyuncs.com/merico/node:20.10.0
+FROM registry.cn-hongkong.aliyuncs.com/merico/node:20.13.1
 
 COPY --from=installer /code/api/_build /code/api/_build
 

diff --git a/Dockerfile-website b/Dockerfile-website
@@ -1,4 +1,4 @@
-FROM registry.cn-hongkong.aliyuncs.com/merico/nginx:latest
+FROM registry.cn-hongkong.aliyuncs.com/merico/nginx:1.25.5
 
 COPY ./website/dist  /usr/share/nginx/html
 

diff --git a/api/package.json b/api/package.json
@@ -54,7 +54,7 @@
     "jsonwebtoken": "^9.0.2",
     "lodash": "^4.17.21",
     "morgan": "^1.10.0",
-    "mysql2": "2.3.3",
+    "mysql2": "3.9.8",
     "npmlog": "^7.0.1",
     "pg": "^8.11.3",
     "reflect-metadata": "^0.1.13",
@@ -80,8 +80,8 @@
     "@types/npmlog": "^7.0.0",
     "@types/pg": "^8.10.9",
     "@types/supertest": "^2.0.16",
-    "gulp": "^4.0.2",
-    "gulp-cli": "^2.3.0",
+    "gulp": "^5.0.0",
+    "gulp-cli": "^3.0.0",
     "gulp-terser": "^2.1.0",
     "gulp-typescript": "^6.0.0-alpha.1",
     "jest": "^29.7.0",