Merge branch 'master' into develop

pull/77/MERGE
guangyuzhang 2021-11-01 14:53:01 +08:00
commit 5ee5fb9fbc
7 changed files with 7 additions and 7 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;'"]

View File

@ -3,4 +3,4 @@ WORKDIR /code
COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
CMD ['python', 'main.py']
CMD ["python", "main.py"]

View File

@ -4,4 +4,4 @@ WORKDIR /code
COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
EXPOSE 8000
CMD ['gunicorn', 'app:api', '-b 0.0.0.0:8000']
CMD ["gunicorn", "app:api", "-b 0.0.0.0:8000"]

View File

@ -3,4 +3,4 @@ WORKDIR /code
COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
CMD ['python', 'main.py']
CMD ["python", "main.py"]

View File

@ -3,4 +3,4 @@ WORKDIR /code
COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
CMD ['python', 'main.py']
CMD ["python", "main.py"]

View File

@ -3,4 +3,4 @@ WORKDIR /code
COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
CMD ['python', 'main.py']
CMD ["python", "main.py"]

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;'"]