edit Dockerfile

Author: yangmv

Dockerfile

@@ -14,24 +14,23 @@ RUN wget https://www.python.org/ftp/python/3.6.6/Python-3.6.6.tar.xz
 RUN xz -d Python-3.6.6.tar.xz && tar xvf Python-3.6.6.tar && cd Python-3.6.6 && ./configure && make && make install
 
 # 3. 复制代码
-RUN mkdir -p /var/www/
+#RUN mkdir -p /var/www/
 ADD . /var/www/CMDB/
+WORKDIR /var/www/CMDB/
 
 # 4. 安装pip依赖
 RUN pip3 install --user --upgrade pip
-RUN pip3 install -r /var/www/CMDB/requirements.txt
+RUN pip3 install -r requirements.txt
 
-# 5.准备配置文件
-RUN cp /var/www/CMDB/cmdb-example.conf /var/www/CMDB/cmdb.conf
-
-# 6. 数据初始化
+# 5. 数据初始化
 # RUN python3 /var/www/CMDB/manage.py makemigrations
 # RUN python3 /var/www/CMDB/manage.py migrate
 
-# 7. 日志
+# 6. 日志
 VOLUME /var/log/
 
-# 8. 准备文件
+# 7. 准备文件
+COPY cmdb-example.conf cmdb.conf
 COPY docs/supervisor_cmdb.conf  /etc/supervisord.conf
 COPY docs/nginx_cmdb.conf /etc/nginx/conf.d/
 

Jenkinsfile

@@ -1,7 +1,7 @@
 node('haimaxy-jnlp') {
     stage('Clone') {
         echo "1.Clone 代码"
-        git url: "$(git_url)"
+        git url: "${git_url}"
         script {
             build_tag = sh(returnStdout: true, script: 'git rev-parse --short HEAD').trim()
         }