Merge remote-tracking branch 'origin/master'

Jenkinsfile

@@ -5,10 +5,13 @@ pipeline {
     stages {
         stage('检测环境') {
             steps {
-                sh '''java -version
-                mvn -v
-                git version
-                docker -v'''
+                sh '''
+                    pwd
+                    java -version
+                    mvn -v
+                    git version
+                    docker -v
+                '''
             }
         }
         stage('拉取代码') {
@@ -26,14 +29,14 @@ pipeline {
         stage('删除原镜像和容器') {
             steps {
                 sh '''
-                echo \'检查utc容器是否存在\'
-                containerid=`docker ps -a|grep signal-utc-service|awk \'{print $1}\'`
+                echo \'检查各个utc容器是否存在\'
+                containerid=`docker ps -a|grep signal-utc |awk \'{print $1}\'`
                 if [ "$containerid" != "" ];then
                   echo \'容器存在，删除容器\'
                   docker rm -f $containerid
                 fi
-                echo \'检查utc镜像是否存在\'
-                imageid=`docker images|grep signal-utc-service|awk \'{print $3}\'`
+                echo \'检查各个utc镜像是否存在\'
+                imageid=`docker images|grep signal-utc | awk \'{print $3}\'`
                 if [ "$imageid" != "" ];then
                   echo \'删除镜像\'
                   docker rmi -f $imageid
@@ -62,18 +65,6 @@ pipeline {
                   echo \'删除镜像\'
                   docker rmi -f $imageid
                 fi
-                echo \'检查utc_dt容器是否存在\'
-                containerid=`docker ps -a|grep signal-utc-dt-service|awk \'{print $1}\'`
-                if [ "$containerid" != "" ];then
-                  echo \'容器存在，删除容器\'
-                  docker rm -f $containerid
-                fi
-                echo \'检查utc_dt镜像是否存在\'
-                imageid=`docker images|grep signal-utc-dt-service|awk \'{print $3}\'`
-                if [ "$imageid" != "" ];then
-                  echo \'删除镜像\'
-                  docker rmi -f $imageid
-                fi
                 '''
             }
         }
@@ -83,14 +74,12 @@ pipeline {
                 sh 'docker pull 10.102.1.182:5000/xinkong/signal-control-service:0.2.1'
                 sh 'docker pull 10.102.1.182:5000/xinkong/signal-optimize-service:0.2.1'
                 sh 'docker pull 10.102.1.182:5000/xinkong/signal-utc-dt-service:0.2.1'
+                sh 'docker pull 10.102.1.182:5000/xinkong/signal-utc-hisense-service:0.2.1'
             }
         }
         stage('运行容器') {
             steps {
-                sh 'docker run -p 32000:32000 -p 15115:15115 -itd -v /logVolume/utc:/logs/utc --name signal-utc-service 10.102.1.182:5000/xinkong/signal-utc-service:0.2.1'
-                sh 'docker run -p 32001:32001 -p 15116:15116 -itd -v /logVolume/web:/logs/web --name signal-control-service 10.102.1.182:5000/xinkong/signal-control-service:0.2.1'
-                sh 'docker run -p 39001:39001 -p 15117:15117 -itd -v /logVolume/opt:/logs/opt --name signal-optimize-service 10.102.1.182:5000/xinkong/signal-optimize-service:0.2.1'
-                sh 'docker run -p 39002:39002 -p 15118:15118 -p 5050:5050 -p 5051:5051 -itd -v /logVolume/dt:/logs/dt --name signal-utc-dt-service 10.102.1.182:5000/xinkong/signal-utc-dt-service:0.2.1'
+                sh 'docker-compose up -d'
             }
         }
     }

docker-compose.yml

+version: '2'
+
+services:
+  utc-service:
+    image: 10.102.1.182:5000/xinkong/signal-utc-service:0.2.1
+    ports:
+      - 32000:32000
+      - 15115:15115
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+    restart: always
+    volumes:
+      - /logVolume/utc:/logs/utc
+    container_name: signal-utc-service
+
+  control-service:
+    image: 10.102.1.182:5000/xinkong/signal-control-service:0.2.1
+    ports:
+      - 32001:32001
+      - 15116:15116
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+    restart: always
+    volumes:
+      - /logVolume/web:/logs/web
+    container_name: signal-control-service
+
+  optimize-service:
+    image: 10.102.1.182:5000/xinkong/signal-optimize-service:0.2.1
+    ports:
+      - 39001:39001
+      - 15117:15117
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+    restart: always
+    volumes:
+      - /logVolume/opt:/logs/opt
+    container_name: signal-optimize-service
+
+  utc-dt-service:
+    image: 10.102.1.182:5000/xinkong/signal-utc-dt-service:0.2.1
+    ports:
+      - 39002:39002
+      - 5051:5051
+      - 5050:5050
+      - 15118:15118
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+    restart: always
+    volumes:
+      - /logVolume/dt:/logs/dt
+    container_name: signal-utc-dt-service
+
+  utc-hisense-service:
+    image: 10.102.1.182:5000/xinkong/signal-utc-hisense-service:0.2.1
+    ports:
+      - 39003:39003
+      - 55051:55051
+      - 55050:55050
+      - 15119:15119
+    environment:
+      - SPRING_PROFILES_ACTIVE=dev
+    restart: always
+    volumes:
+      - /logVolume/hisense:/logs/hisense
+    container_name: signal-utc-hisense-service
\ No newline at end of file