mrbird пре 6 година
родитељ
комит
1df2b1c394

+ 4 - 2
febs-auth/Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-auth-1.1-SNAPSHOT.jar /febs/febs-auth-1.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-Xmx256m", "-jar", "/febs/febs-auth-1.1-SNAPSHOT.jar"]
+COPY ./target/febs-auth-1.3-SNAPSHOT.jar /febs/febs-auth-1.3-SNAPSHOT.jar
+ADD agent/ /agent
+
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-auth", "-Dskywalking.collector.backend_service=X.X.X.X:11800", "-Xmx256m", "-jar", "/febs/febs-auth-1.3-SNAPSHOT.jar"]

+ 3 - 3
febs-auth/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-auth</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>FEBS-Auth</name>
     <description>FEBS-Cloud认证服务器</description>
 
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>cc.mrbird</groupId>
             <artifactId>febs-common</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

+ 1 - 1
febs-cloud/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>cc.mrbird</groupId>
     <artifactId>febs-cloud</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>FEBS-Cloud</name>

+ 2 - 2
febs-common/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-common</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>FEBS-Common</name>
     <description>FEBS-Common通用模块</description>
 

+ 4 - 2
febs-gateway/Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-gateway-1.1-SNAPSHOT.jar /febs/febs-gateway-1.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-Xmx256m", "-jar", "/febs/febs-gateway-1.1-SNAPSHOT.jar"]
+COPY ./target/febs-gateway-1.3-SNAPSHOT.jar /febs/febs-gateway-1.3-SNAPSHOT.jar
+ADD agent/ /agent
+
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-gateway", "-Dskywalking.collector.backend_service=X.X.X.X:11800", "-Xmx256m", "-jar", "/febs/febs-gateway-1.3-SNAPSHOT.jar"]

+ 3 - 3
febs-gateway/pom.xml

@@ -5,11 +5,11 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
     <artifactId>febs-gateway</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>FEBS-Gateway</name>
     <description>FEBS-Gateway服务网关模块</description>
 
@@ -17,7 +17,7 @@
         <dependency>
             <groupId>cc.mrbird</groupId>
             <artifactId>febs-common</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.3-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.springframework.boot</groupId>

+ 4 - 2
febs-monitor/febs-monitor-admin/Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-monitor-admin-1.1-SNAPSHOT.jar /febs/febs-monitor-admin-1.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-Xmx256m", "-jar", "/febs/febs-monitor-admin-1.1-SNAPSHOT.jar"]
+COPY ./target/febs-monitor-admin-1.3-SNAPSHOT.jar /febs/febs-monitor-admin-1.3-SNAPSHOT.jar
+ADD agent/ /agent
+
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-monitor-admin", "-Dskywalking.collector.backend_service=X.X.X.X:11800", "-Xmx256m", "-jar", "/febs/febs-monitor-admin-1.3-SNAPSHOT.jar"]

+ 2 - 2
febs-monitor/febs-monitor-admin/pom.xml

@@ -5,12 +5,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-monitor</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-monitor-admin</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>Febs-Monitor-Admin</name>
     <description>Febs-Monitor-Admin基于Spring Boot Admin搭建的监控程序</description>
 

+ 2 - 2
febs-monitor/pom.xml

@@ -5,13 +5,13 @@
     <parent>
         <artifactId>febs-cloud</artifactId>
         <groupId>cc.mrbird</groupId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>febs-monitor</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>FEBS-Monitor</name>
     <description>FEBS-Monitor监控模块</description>

+ 4 - 2
febs-server/febs-server-system/Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-system-1.1-SNAPSHOT.jar /febs/febs-server-system-1.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-Xmx256m", "-jar", "/febs/febs-server-system-1.1-SNAPSHOT.jar"]
+COPY ./target/febs-server-system-1.3-SNAPSHOT.jar /febs/febs-server-system-1.3-SNAPSHOT.jar
+ADD agent/ /agent
+
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-system", "-Dskywalking.collector.backend_service=X.X.X.X:11800", "-Xmx256m", "-jar", "/febs/febs-server-system-1.3-SNAPSHOT.jar"]

+ 2 - 2
febs-server/febs-server-system/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-server-system</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>FEBS-Server-System</name>
     <description>FEBS-Server-System微服务系统模块</description>
 

+ 4 - 2
febs-server/febs-server-test/Dockerfile

@@ -1,5 +1,7 @@
 FROM openjdk:8u212-jre
 MAINTAINER MrBird 852252810@qq.com
 
-COPY ./target/febs-server-test-1.1-SNAPSHOT.jar /febs/febs-server-test-1.1-SNAPSHOT.jar
-ENTRYPOINT ["java", "-Xmx256m", "-jar", "/febs/febs-server-test-1.1-SNAPSHOT.jar"]
+COPY ./target/febs-server-test-1.3-SNAPSHOT.jar /febs/febs-server-test-1.3-SNAPSHOT.jar
+ADD agent/ /agent
+
+ENTRYPOINT ["java", "-javaagent:/agent/skywalking-agent.jar", "-Dskywalking.agent.service_name=febs-server-test", "-Dskywalking.collector.backend_service=X.X.X.X:11800", "-Xmx256m", "-jar", "/febs/febs-server-test-1.3-SNAPSHOT.jar"]

+ 2 - 2
febs-server/febs-server-test/pom.xml

@@ -6,12 +6,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-server</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-server-test</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>FEBS-Server-Test</name>
     <description>FEBS-Server-Test测试服务模块</description>
 

+ 3 - 3
febs-server/pom.xml

@@ -7,12 +7,12 @@
     <parent>
         <groupId>cc.mrbird</groupId>
         <artifactId>febs-cloud</artifactId>
-        <version>1.1-SNAPSHOT</version>
+        <version>1.3-SNAPSHOT</version>
         <relativePath>../febs-cloud/pom.xml</relativePath>
     </parent>
 
     <artifactId>febs-server</artifactId>
-    <version>1.1-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>FEBS-Server</name>
     <description>FEBS-Server服务提供模块</description>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cc.mrbird</groupId>
             <artifactId>febs-common</artifactId>
-            <version>1.1-SNAPSHOT</version>
+            <version>1.3-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>