Skip to content

Commit 3643a26

Browse files
authored
Merge pull request #1437 from long2ice/main
chore: update docker base image
2 parents e5d4c15 + a5e07cb commit 3643a26

File tree

4 files changed

+479
-1646
lines changed

4 files changed

+479
-1646
lines changed

Dockerfile-api

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN yarn set version $YARN_VERSION
1515
RUN yarn config set nodeLinker node-modules
1616
RUN yarn install
1717

18-
FROM registry.cn-hongkong.aliyuncs.com/merico/node:20.10.0
18+
FROM registry.cn-hongkong.aliyuncs.com/merico/node:20.13.1
1919

2020
COPY --from=installer /code/api/_build /code/api/_build
2121

Dockerfile-website

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM registry.cn-hongkong.aliyuncs.com/merico/nginx:latest
1+
FROM registry.cn-hongkong.aliyuncs.com/merico/nginx:1.25.5
22

33
COPY ./website/dist /usr/share/nginx/html
44

api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
"jsonwebtoken": "^9.0.2",
5555
"lodash": "^4.17.21",
5656
"morgan": "^1.10.0",
57-
"mysql2": "2.3.3",
57+
"mysql2": "3.9.8",
5858
"npmlog": "^7.0.1",
5959
"pg": "^8.11.3",
6060
"reflect-metadata": "^0.1.13",
@@ -80,8 +80,8 @@
8080
"@types/npmlog": "^7.0.0",
8181
"@types/pg": "^8.10.9",
8282
"@types/supertest": "^2.0.16",
83-
"gulp": "^4.0.2",
84-
"gulp-cli": "^2.3.0",
83+
"gulp": "^5.0.0",
84+
"gulp-cli": "^3.0.0",
8585
"gulp-terser": "^2.1.0",
8686
"gulp-typescript": "^6.0.0-alpha.1",
8787
"jest": "^29.7.0",

0 commit comments

Comments
 (0)