Merge branch 'develop'

pull/80/head
guangyuzhang 2021-11-02 16:51:46 +08:00
commit b6e1a380cf
2 changed files with 2 additions and 2 deletions

2
admin/Dockerfile vendored
View File

@ -9,4 +9,4 @@ RUN rm /etc/nginx/conf.d/default.conf && \
COPY nginx.conf /etc/nginx/
COPY . /var/www/html/admin
EXPOSE 8001
CMD ["nginx", "-c /etc/nginx/nginx.conf", "-g 'daemon off;'"]
CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]

2
web/Dockerfile vendored
View File

@ -9,4 +9,4 @@ RUN rm /etc/nginx/conf.d/default.conf && \
COPY nginx.conf /etc/nginx/
COPY ./build/ /var/www/html/web
EXPOSE 80
CMD ["nginx", "-c /etc/nginx/nginx.conf", "-g 'daemon off;'"]
CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]