Commit cfa483cd authored by 胡凯旋's avatar 胡凯旋

update Dockerfile / Jenkinsfile

parent 6a2490bb
...@@ -44,15 +44,14 @@ RUN apk add --no-cache --virtual .build-deps \ ...@@ -44,15 +44,14 @@ RUN apk add --no-cache --virtual .build-deps \
&& sed -i '/st_mysql_options options;/a unsigned int reconnect;' /usr/include/mysql/mysql.h \ && sed -i '/st_mysql_options options;/a unsigned int reconnect;' /usr/include/mysql/mysql.h \
&& pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/common.txt \ && pip install --no-cache-dir -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/common.txt \
&& mkdir -p /tmp/video_convert \ && mkdir -p /tmp/video_convert \
&& mkdir -p /data/log/gaia/app && mkdir -p /data/log/graces/app
COPY . /srv/apps/gaia/ COPY . /srv/apps/graces/
WORKDIR /srv/apps/gaia/ WORKDIR /srv/apps/graces/
# requirements文件中指定安装master分支的依赖每次构建镜像都会重新安装 # requirements文件中指定安装master分支的依赖每次构建镜像都会重新安装
RUN cat requirements/common.txt | grep master > /tmp/gm-requirements.txt \ RUN cat requirements/common.txt | grep master > /tmp/gm-requirements.txt \
&& pip install --no-deps --upgrade -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/gm-requirements.txt \ && pip install --no-deps --upgrade -i http://mirrors.aliyun.com/pypi/simple/ --trusted-host mirrors.aliyun.com -r /tmp/gm-requirements.txt \
&& apk del .build-deps && apk del .build-deps
CMD gunicorn gaia.wsgi:application -w 6 -k gevent -b 0.0.0.0:8000 --worker-tmp-dir /dev/shm
...@@ -23,7 +23,7 @@ pipeline { ...@@ -23,7 +23,7 @@ pipeline {
TAG = dockerTag() TAG = dockerTag()
// Image Full Tag // Image Full Tag
IMAGE = "${DOCKER_REGISTRY}/gm-backend/gaia:$TAG" IMAGE = "${DOCKER_REGISTRY}/gm-backend/graces:$TAG"
} }
stages { stages {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment