From 753adcdd515132261683bb489b20d029b54b9299 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Tue, 29 Oct 2019 22:36:42 +0800
Subject: [PATCH] :tada: 2.2.0.RELEASE

---
 blade-ops/blade-turbine/Dockerfile | 15 ++++++++++
 blade-ops/blade-turbine/pom.xml    | 45 ++++++++++++++++++++++++++++++
 blade-ops/blade-zipkin/Dockerfile  | 15 ++++++++++
 blade-ops/blade-zipkin/pom.xml     | 45 ++++++++++++++++++++++++++++++
 script/docker/deploy.sh            | 12 ++++----
 script/docker/docker-compose.yml   | 22 +++++++++++++++
 6 files changed, 149 insertions(+), 5 deletions(-)
 create mode 100644 blade-ops/blade-turbine/Dockerfile
 create mode 100644 blade-ops/blade-zipkin/Dockerfile

diff --git a/blade-ops/blade-turbine/Dockerfile b/blade-ops/blade-turbine/Dockerfile
new file mode 100644
index 00000000..559a24ae
--- /dev/null
+++ b/blade-ops/blade-turbine/Dockerfile
@@ -0,0 +1,15 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER smallchill@163.com
+
+RUN mkdir -p /blade/turbine
+
+WORKDIR /blade/turbine
+
+EXPOSE 7003
+
+ADD ./target/blade-turbine.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=test"]
diff --git a/blade-ops/blade-turbine/pom.xml b/blade-ops/blade-turbine/pom.xml
index 2ff33189..46f224db 100644
--- a/blade-ops/blade-turbine/pom.xml
+++ b/blade-ops/blade-turbine/pom.xml
@@ -52,4 +52,49 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.plugin.version}</version>
+                <configuration>
+                    <imageName>${docker.registry.url}/blade/${project.artifactId}:${project.version}</imageName>
+                    <dockerDirectory>${project.basedir}</dockerDirectory>
+                    <dockerHost>${docker.registry.host}</dockerHost>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <registryUrl>${docker.registry.url}</registryUrl>
+                    <serverId>${docker.registry.url}</serverId>
+                    <pushImage>true</pushImage>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!--suppress UnresolvedMavenProperty -->
+                                <copy overwrite="true"
+                                      tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
+                                      file="${project.build.directory}/${project.artifactId}.jar" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/blade-ops/blade-zipkin/Dockerfile b/blade-ops/blade-zipkin/Dockerfile
new file mode 100644
index 00000000..313e11ef
--- /dev/null
+++ b/blade-ops/blade-zipkin/Dockerfile
@@ -0,0 +1,15 @@
+FROM anapsix/alpine-java:8_server-jre_unlimited
+
+MAINTAINER smallchill@163.com
+
+RUN mkdir -p /blade/zipkin
+
+WORKDIR /blade/zipkin
+
+EXPOSE 9411
+
+ADD ./target/blade-zipkin.jar ./app.jar
+
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-jar", "app.jar"]
+
+CMD ["--spring.profiles.active=test"]
diff --git a/blade-ops/blade-zipkin/pom.xml b/blade-ops/blade-zipkin/pom.xml
index 79b10950..61570a8f 100644
--- a/blade-ops/blade-zipkin/pom.xml
+++ b/blade-ops/blade-zipkin/pom.xml
@@ -51,4 +51,49 @@
         </dependency>
     </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>${docker.plugin.version}</version>
+                <configuration>
+                    <imageName>${docker.registry.url}/blade/${project.artifactId}:${project.version}</imageName>
+                    <dockerDirectory>${project.basedir}</dockerDirectory>
+                    <dockerHost>${docker.registry.host}</dockerHost>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                    <registryUrl>${docker.registry.url}</registryUrl>
+                    <serverId>${docker.registry.url}</serverId>
+                    <pushImage>true</pushImage>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-antrun-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>run</goal>
+                        </goals>
+                        <configuration>
+                            <tasks>
+                                <!--suppress UnresolvedMavenProperty -->
+                                <copy overwrite="true"
+                                      tofile="${session.executionRootDirectory}/target/${project.artifactId}.jar"
+                                      file="${project.build.directory}/${project.artifactId}.jar" />
+                            </tasks>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
 </project>
diff --git a/script/docker/deploy.sh b/script/docker/deploy.sh
index 61893aff..285b4de9 100644
--- a/script/docker/deploy.sh
+++ b/script/docker/deploy.sh
@@ -14,6 +14,8 @@ port(){
 	firewall-cmd --add-port=3306/tcp --permanent
 	firewall-cmd --add-port=3379/tcp --permanent
 	firewall-cmd --add-port=7002/tcp --permanent
+	firewall-cmd --add-port=7003/tcp --permanent
+	firewall-cmd --add-port=9411/tcp --permanent
 	firewall-cmd --add-port=9999/tcp --permanent
 	service firewalld restart
 }
@@ -40,16 +42,16 @@ base(){
 	docker-compose up -d nacos sentinel web-nginx blade-nginx blade-redis
 }
 
+#启动监控模块
+monitor(){
+	docker-compose up -d blade-admin blade-turbine blade-zipkin
+}
+
 #启动程序模块
 modules(){
 	docker-compose up -d blade-gateway1 blade-gateway2 blade-auth1 blade-auth2 blade-user blade-desk blade-system blade-log blade-flow blade-flow-design blade-resource
 }
 
-#启动监控模块
-monitor(){
-	docker-compose up -d blade-admin
-}
-
 #关闭所有模块
 stop(){
 	docker-compose stop
diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml
index 39adef4a..0d9d9416 100644
--- a/script/docker/docker-compose.yml
+++ b/script/docker/docker-compose.yml
@@ -82,6 +82,28 @@ services:
     networks:
     - blade_net
 
+  blade-turbine:
+    image: "${REGISTER}/blade/blade-turbine:${TAG}"
+    environment:
+      - TZ=Asia/Shanghai
+    ports:
+      - 7003:7003
+    privileged: true
+    restart: always
+    networks:
+      - blade_net
+
+  blade-zipkin:
+    image: "${REGISTER}/blade/blade-zipkin:${TAG}"
+    environment:
+      - TZ=Asia/Shanghai
+    ports:
+      - 9411:9411
+    privileged: true
+    restart: always
+    networks:
+      - blade_net
+
   blade-gateway1:
     image: "${REGISTER}/blade/blade-gateway:${TAG}"
     environment: