Merge remote-tracking branch 'upstream/develop' into develop

pull/77/head
Caozhenhui 2021-11-02 17:03:08 +08:00
commit 62ad53d430
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 nginx.conf /etc/nginx/
COPY . /var/www/html/admin COPY . /var/www/html/admin
EXPOSE 8001 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 COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com 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 COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com
EXPOSE 8000 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 COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com 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 COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com 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 COPY . /code
RUN pip install -r requirements.txt -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com 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 nginx.conf /etc/nginx/
COPY ./build/ /var/www/html/web COPY ./build/ /var/www/html/web
EXPOSE 80 EXPOSE 80
CMD ['nginx', '-c /etc/nginx/nginx.conf', '-g "daemon off;"'] CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"]