Browse Source

加入docker-componse

wuxw7 7 years ago
parent
commit
5b77063ee1

+ 4 - 14
Api/docker/docker-compose.yml

@@ -2,19 +2,9 @@ version: '2'
 services:
    api-1:
        container_name: api-1
-       image: 'registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0'
-       user: tomcat
+       build:
+          context: .
+          dockerfile: Dockerfile
        restart: always
-       ports:
-       - "8008:8008"
        volumes:
-       - ./prop:/home/tomcat/prop
-       - ./webapps/portal-web.war:/home/tomcat/webapps/portal-web.war
-       - ./conf/catalina.sh:/home/tomcat/bin/catalina.sh
-       - ./dump:/home/tomcat/dump
-       - ../hlog:/home/tomcat/hlog
-       - ../pinpoint:/home/tomcat/pinpoint
-       - ../ojdbc/ojdbc7.jar:/home/tomcat/lib/ojdbc7.jar
-       dns:
-       - 135.192.40.121
-       network_mode: "bridge"
+       - ../target/Api.jar:/root/target/Api.jar

+ 0 - 2
CenterService/docker/Dockerfile

@@ -1,8 +1,6 @@
 FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
 MAINTAINER wuxw <928255095@qq.com>
 
-ADD target/CenterService.jar /root/target/
-
 ADD bin/start_center.sh /root/
 
 

+ 10 - 0
CenterService/docker/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+   api-1:
+       container_name: centerService-1
+       build:
+          context: .
+          dockerfile: Dockerfile
+       restart: always
+       volumes:
+       - ../target/CenterService.jar:/root/target/CenterService.jar

+ 0 - 2
ShopService/docker/Dockerfile

@@ -1,8 +1,6 @@
 FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
 MAINTAINER wuxw <928255095@qq.com>
 
-ADD target/ShopService.jar /root/target/
-
 ADD bin/start_shop.sh /root/
 
 

+ 10 - 0
ShopService/docker/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+   api-1:
+       container_name: shopSerivce-1
+       build:
+          context: .
+          dockerfile: Dockerfile
+       restart: always
+       volumes:
+       - ../target/ShopService.jar:/root/target/ShopService.jar

+ 0 - 1
StoreService/docker/Dockerfile

@@ -1,7 +1,6 @@
 FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
 MAINTAINER wuxw <928255095@qq.com>
 
-ADD target/StoreService.jar /root/target/
 
 ADD bin/start_store.sh /root/
 

+ 10 - 0
StoreService/docker/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+   api-1:
+       container_name: storeSerivce-1
+       build:
+          context: .
+          dockerfile: Dockerfile
+       restart: always
+       volumes:
+       - ../target/StoreService.jar:/root/target/StoreService.jar

+ 0 - 2
UserService/docker/Dockerfile

@@ -1,8 +1,6 @@
 FROM registry.cn-beijing.aliyuncs.com/sxd/ubuntu-java8:1.0
 MAINTAINER wuxw <928255095@qq.com>
 
-ADD target/UserService.jar /root/target/
-
 ADD bin/start_user.sh /root/
 
 

+ 10 - 0
UserService/docker/docker-compose.yml

@@ -0,0 +1,10 @@
+version: '2'
+services:
+   api-1:
+       container_name: userService-1
+       build:
+          context: .
+          dockerfile: Dockerfile
+       restart: always
+       volumes:
+       - ../target/UserService.jar:/root/target/UserService.jar

+ 12 - 3
reBuildAll.sh

@@ -1,4 +1,13 @@
 #!/usr/bin/env bash
-mvn clean install;
-mvn clean package;
-docker-compose -f /data/qhcrm/app-assist/docker-compose.yml       up -d --force-recreate;
+
+git pull origin master
+
+mvn clean install
+mvn package;
+
+docker-compose -f ./app/Api/docker/docker-compose.yml       up -d --force-recreate;
+docker-compose -f ./app/CenterService/docker/docker-compose.yml       up -d --force-recreate;
+docker-compose -f ./app/ShopService/docker/docker-compose.yml       up -d --force-recreate;
+docker-compose -f ./app/StoreService/docker/docker-compose.yml       up -d --force-recreate;
+docker-compose -f ./app/UserService/docker/docker-compose.yml       up -d --force-recreate;
+