Jelajahi Sumber

docker改造

lym 1 bulan lalu
induk
melakukan
f70d0873ee

+ 35 - 0
common-parent/pom.xml

@@ -54,7 +54,42 @@
         <group.meal.order.client.version>0.0.1-SNAPSHOT</group.meal.order.client.version>
         <group.meal.order.service.version>0.0.1-SNAPSHOT</group.meal.order.service.version>
         <group.meal.web.version>0.0.1-SNAPSHOT</group.meal.web.version>
+
+        <!-- docker 配置 -->
+        <docker.version>1</docker.version>
+        <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
     </properties>
+
+    <profiles>
+        <profile>
+            <id>dev</id>
+            <!--默认激活当前配置-->
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <properties>
+                <profiles.active>dev</profiles.active>
+                <!-- Docker 配置 -->
+                <docker.dockerHost>http://172.16.90.199:2376</docker.dockerHost>
+                <docker.serviceId>DockerHub</docker.serviceId>
+                <docker.sslpath></docker.sslpath>
+                <docker.image.version>1.0.0</docker.image.version>
+            </properties>
+        </profile>
+        <profile>
+            <id>pro</id>
+            <properties>
+                <profiles.active>pro</profiles.active>
+                <!-- Docker 配置 -->
+                <docker.dockerHost>http://172.16.90.199:2376</docker.dockerHost>
+                <docker.serviceId>DockerHub</docker.serviceId>
+                <!-- <docker.sslpath>../doc/ssl/pro</docker.sslpath> -->
+                <docker.sslpath></docker.sslpath>
+                <docker.image.version>${maven.build.timestamp}.${docker.version}</docker.image.version>
+            </properties>
+        </profile>
+    </profiles>
+
     <dependencyManagement>
         <dependencies>
             <dependency>

+ 18 - 0
eureka-server/pom.xml

@@ -32,6 +32,24 @@
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-maven-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <configuration>
+                    <serverId>${docker.serviceId}</serverId>
+                    <dockerHost>${docker.dockerHost}</dockerHost>
+                    <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>

+ 7 - 0
eureka-server/src/main/docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8-jdk-alpine
+# time zone
+RUN echo "Asia/Shanghai" > /etc/timezone
+# VOLUME /logs
+COPY eureka-register-server-1.0.0-SNAPSHOT.jar app.jar
+# ENV JAVA_OPTS=""
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx512m","-jar","app.jar"]

+ 18 - 0
goods-manage-service/pom.xml

@@ -316,6 +316,24 @@
                     <configurationFile>src/main/resources/generatorConfig.xml</configurationFile>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <configuration>
+                    <serverId>${docker.serviceId}</serverId>
+                    <dockerHost>${docker.dockerHost}</dockerHost>
+                    <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

+ 7 - 0
goods-manage-service/src/main/docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8-jdk-alpine
+# time zone
+RUN echo "Asia/Shanghai" > /etc/timezone
+# VOLUME /logs
+COPY goods-manage-service-0.0.1-SNAPSHOT.jar app.jar
+# ENV JAVA_OPTS=""
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx512m","-jar","app.jar"]

+ 3 - 3
goods-manage-service/src/main/resources/application-dev.properties

@@ -12,10 +12,10 @@ spring.http.multipart.maxRequestSize=10Mb
 #mysql datasource setting
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://172.16.90.64:3306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://172.16.90.156:13306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/food_security_db?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.username=admin
+spring.datasource.password=Dzkj$123
 #spring.datasource.password=123456
 #spring.datasource.password=root
 spring.datasource.initialSize=5

+ 18 - 0
org-manage-service/pom.xml

@@ -281,6 +281,24 @@
                     <configurationFile>src/main/resources/generatorConfig.xml</configurationFile>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <configuration>
+                    <serverId>${docker.serviceId}</serverId>
+                    <dockerHost>${docker.dockerHost}</dockerHost>
+                    <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

+ 7 - 0
org-manage-service/src/main/docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8-jdk-alpine
+# time zone
+RUN echo "Asia/Shanghai" > /etc/timezone
+# VOLUME /logs
+COPY org-manage-service-0.0.1-SNAPSHOT.jar app.jar
+# ENV JAVA_OPTS=""
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx512m","-jar","app.jar"]

+ 3 - 3
org-manage-service/src/main/resources/application-dev.properties

@@ -12,10 +12,10 @@ spring.http.multipart.maxRequestSize=10Mb
 #mysql datasource setting
 spring.datasource.driver-class-name=com.mysql.jdbc.Driver
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-spring.datasource.url=jdbc:mysql://172.16.90.64:3306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
+spring.datasource.url=jdbc:mysql://172.16.90.156:13306/forest_traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useSSL=false&&allowMultiQueries=true
 #spring.datasource.url=jdbc:mysql://localhost:3306/traced_source?characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull
-spring.datasource.username=root
-spring.datasource.password=123456
+spring.datasource.username=admin
+spring.datasource.password=Dzkj$123
 #spring.datasource.password=123456
 #spring.datasource.password=root
 spring.datasource.initialSize=5

+ 18 - 0
traced-source-web/pom.xml

@@ -195,6 +195,24 @@
                     <skipTests>true</skipTests>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>com.spotify</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>1.2.2</version>
+                <configuration>
+                    <serverId>${docker.serviceId}</serverId>
+                    <dockerHost>${docker.dockerHost}</dockerHost>
+                    <imageName>docker.io/${project.artifactId}:${docker.image.version}</imageName>
+                    <dockerDirectory>${project.basedir}/src/main/docker</dockerDirectory>
+                    <resources>
+                        <resource>
+                            <targetPath>/</targetPath>
+                            <directory>${project.build.directory}</directory>
+                            <include>${project.build.finalName}.jar</include>
+                        </resource>
+                    </resources>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
     

+ 7 - 0
traced-source-web/src/main/docker/Dockerfile

@@ -0,0 +1,7 @@
+FROM openjdk:8-jdk-alpine
+# time zone
+RUN echo "Asia/Shanghai" > /etc/timezone
+# VOLUME /logs
+COPY traced-source-web-0.0.1-SNAPSHOT.jar app.jar
+# ENV JAVA_OPTS=""
+CMD ["java","-Djava.security.egd=file:/dev/./urandom", "-Xms512m", "-Xmx512m","-jar","app.jar"]

+ 1 - 1
traced-source-web/src/main/resources/application-dev.properties

@@ -1,4 +1,4 @@
-server.port=21008
+server.port=21881
 spring.application.name=traced-web
 spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
 spring.jackson.time-zone=GMT+8