diff --git a/backend/gunicorn.pid b/backend/gunicorn.pid new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/backend/gunicorn.pid @@ -0,0 +1 @@ +7 diff --git a/docker_env/web/Dockerfile b/docker_env/web/Dockerfile index 8a4bf78..2797a90 100644 --- a/docker_env/web/Dockerfile +++ b/docker_env/web/Dockerfile @@ -1,7 +1,8 @@ -FROM registry.cn-zhangjiakou.aliyuncs.com/dvadmin-pro/dvadmin3-base-web:latest +FROM node:16.19-alpine WORKDIR /web/ COPY web/. . -RUN cnpm run build +RUN yarn install +RUN yarn build FROM nginx:alpine COPY ./docker_env/nginx/my.conf /etc/nginx/conf.d/my.conf diff --git a/docker_env/web/DockerfileBuild b/docker_env/web/DockerfileBuild index 112546f..3764903 100644 --- a/docker_env/web/DockerfileBuild +++ b/docker_env/web/DockerfileBuild @@ -1,4 +1,4 @@ -FROM node:14-alpine +FROM node:16.19-alpine WORKDIR / 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