Merge branch 'master' of ssh://10.10.100.21/source/platform-bi-web

Dockerfile

@@ -9,7 +9,6 @@ FROM ubuntu
 # MAINTAINER name Chunteng Xiao
 RUN apt-get update
 RUN apt-get install -y nodejs nginx npm
-RUN rm -v /etc/nginx/nginx.conf
-ADD nginx.conf /etc/nginx
-EXPOSE 80
-CMD service nginx start
+RUN npm install -g cnpm --registry=https://registry.npm.taobao.org
+ADD default /etc/nginx/sites-available
+EXPOSE 80

Jenkinsfile

@@ -14,9 +14,10 @@ pipeline {
         }
         stage('Deliver'){
             steps {
-                sh './jenkins/scripts/deliver.sh'
+                sh 'npm run build'
+                sh 'echo $! > .pidfile'
+                sh 'service nginx start'
                 input message: 'Finished using the web site? (Click "Proceed" to continue)'
-                sh './jenkins/scripts/kill.sh'
             }
         }
             

nginx.conf → default

@@ -1,13 +1,9 @@
-worker_processes 1;
-event { worker_connections 1024 };
-http {
 server {
 	listen 80;
 	server_name 192.168.253.189;
 	access_log /var/log/nginx/fuck.log;
-	root /usr/bi-web;
+	root /var/jenkins_home/workspace/bi-web/dist;
 	index index.html index.htm;
 	location / {
 	}
 }
-}