Merge remote-tracking branch 'upstream/develop' into develop
commit
62ad53d430
|
@ -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;"]
|
|
@ -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"]
|
|
@ -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"]
|
|
@ -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"]
|
|
@ -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"]
|
|
@ -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"]
|
|
@ -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;"]
|
Loading…
Reference in New Issue