Merge remote-tracking branch 'origin/master'

This commit is contained in:
H0nGzA1
2023-02-27 09:09:56 +08:00
3 changed files with 6 additions and 4 deletions

1
backend/gunicorn.pid Normal file
View File

@@ -0,0 +1 @@
7

View File

@@ -1,7 +1,8 @@
FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:latest FROM node:16.19-alpine
WORKDIR /web/ WORKDIR /web/
COPY web/. . COPY web/. .
RUN cnpm run build RUN yarn install
RUN yarn build
FROM nginx:alpine FROM nginx:alpine
COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf

View File

@@ -1,4 +1,4 @@
FROM node:14-alpine FROM node:16.19-alpine
WORKDIR / WORKDIR /
COPY ./web/package.json . COPY ./web/package.json .
RUN npm install -g cnpm --registry=https://registry.npm.taobao.org && cnpm install --registry=https://registry.npm.taobao.org RUN npm install -g yarn