Merge branch 'PR' into develop

pull/137/MERGE
13621160019@163.com 2022-03-29 22:41:12 +08:00
commit ccec8d98a2
2 changed files with 12 additions and 12 deletions

View File

@ -1,4 +1,11 @@
FROM nginx:latest
FROM node:latest as build-stage
WORKDIR /opt
COPY . .
RUN npm install --registry https://registry.npm.taobao.org
RUN npm run build
FROM nginx:latest as production-stage
# remove the default config
RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf
@ -7,7 +14,8 @@ RUN rm /etc/nginx/conf.d/default.conf && rm /etc/nginx/nginx.conf
RUN mkdir -p /var/www/myems-web
# Note: You should run 'npm run build' in the web direction to generate the production build.
COPY nginx.conf /etc/nginx/
COPY ./build/ /var/www/myems-web
COPY --from=build-stage /opt/build/ /var/www/myems-web
EXPOSE 80
CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]

View File

@ -71,18 +71,10 @@ cd myems/myems-web
nano nginx.conf
```
* Download all the necessary dependencies into the node_modules directory.
```bash
npm i --unsafe-perm=true --allow-root --legacy-peer-deps
```
* Build for production with NPM
```bash
npm run build
```
* Build a Docker image
**NOTE**: You can safely ignore the command 'npm run build' in this section, because it is built into the Dockerfile
On Windows:
```bash
cp -r myems/myems-web c:\myems-web