diff --git a/mhd-auth/Dockerfile b/mhd-auth/Dockerfile index ab8325a42..d29ce88f5 100644 --- a/mhd-auth/Dockerfile +++ b/mhd-auth/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 @@ -15,3 +15,4 @@ ADD mhd-auth.jar mhd-auth.jar EXPOSE 9200 # 运行jar包 ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-Xms1000m", "-Xmx1500m","-jar","/mhd-auth.jar"] + diff --git a/mhd-auth/pom.xml b/mhd-auth/pom.xml index 9961823e0..ce1606edc 100644 --- a/mhd-auth/pom.xml +++ b/mhd-auth/pom.xml @@ -85,4 +85,18 @@ + + + mhd-auth + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-auth/src/main/resources/bootstrap.yml b/mhd-auth/src/main/resources/bootstrap.yml index 9e60f8ac2..ddb64b1d3 100644 --- a/mhd-auth/src/main/resources/bootstrap.yml +++ b/mhd-auth/src/main/resources/bootstrap.yml @@ -12,13 +12,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-gateway/Dockerfile b/mhd-gateway/Dockerfile index 9c79e4652..8b870933c 100644 --- a/mhd-gateway/Dockerfile +++ b/mhd-gateway/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-gateway/pom.xml b/mhd-gateway/pom.xml index 6cda48c31..b066a4359 100644 --- a/mhd-gateway/pom.xml +++ b/mhd-gateway/pom.xml @@ -127,4 +127,18 @@ + + + mhd-gateway + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-gateway/src/main/resources/bootstrap.yml b/mhd-gateway/src/main/resources/bootstrap.yml index e858447d1..d1a88efe4 100644 --- a/mhd-gateway/src/main/resources/bootstrap.yml +++ b/mhd-gateway/src/main/resources/bootstrap.yml @@ -13,13 +13,15 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 10.102.192.5:6848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-modules/mhd-system/Dockerfile b/mhd-modules/mhd-system/Dockerfile index 3098d7b9f..e301ffd5a 100644 --- a/mhd-modules/mhd-system/Dockerfile +++ b/mhd-modules/mhd-system/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd-modules/mhd-system/pom.xml b/mhd-modules/mhd-system/pom.xml index 923472867..b58151899 100644 --- a/mhd-modules/mhd-system/pom.xml +++ b/mhd-modules/mhd-system/pom.xml @@ -148,4 +148,19 @@ + + + + mhd-modules-system + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml index 351d1a52d..16293438f 100644 --- a/mhd-modules/mhd-system/src/main/resources/bootstrap.yml +++ b/mhd-modules/mhd-system/src/main/resources/bootstrap.yml @@ -13,13 +13,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd-user-center/Dockerfile b/mhd-user-center/Dockerfile index 2716ebcb4..ac5ee8857 100644 --- a/mhd-user-center/Dockerfile +++ b/mhd-user-center/Dockerfile @@ -1,14 +1,9 @@ # 基础镜像 -FROM kdvolder/jdk8 -# author -MAINTAINER manhuoda +FROM arm64v8/openjdk:8-jre-slim #指定东八区时区 ENV TZ Asia/Shanghai #指定utf-8编码格 ENV JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF-8" -# VOLUME 指定了临时文件目录为/tmp。 -# 其效果是在主机 /var/lib/docker 目录下创建了一个临时文件，并链接到容器的/tmp -VOLUME /tmp #将当前jar 复制到容器根目录下 ADD mhd-user-center.jar mhd-user-center.jar #暴露容器端口 Docker镜像告知Docker宿主机应用监听了端口 diff --git a/mhd-user-center/pom.xml b/mhd-user-center/pom.xml index 25dd0c35e..a606b42ed 100644 --- a/mhd-user-center/pom.xml +++ b/mhd-user-center/pom.xml @@ -174,4 +174,18 @@ + + + + mhd-user-center + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd-user-center/src/main/resources/bootstrap.yml b/mhd-user-center/src/main/resources/bootstrap.yml index 611627ee0..f26ae0f15 100644 --- a/mhd-user-center/src/main/resources/bootstrap.yml +++ b/mhd-user-center/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_finance/Dockerfile b/mhd_finance/Dockerfile index 73e7eef62..6797e4d46 100644 --- a/mhd_finance/Dockerfile +++ b/mhd_finance/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_finance/pom.xml b/mhd_finance/pom.xml index b9e4a2be6..37138e56b 100644 --- a/mhd_finance/pom.xml +++ b/mhd_finance/pom.xml @@ -182,4 +182,17 @@ + + + mhd_finance + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_finance/src/main/resources/bootstrap.yml b/mhd_finance/src/main/resources/bootstrap.yml index cb609f6e6..97e774c85 100644 --- a/mhd_finance/src/main/resources/bootstrap.yml +++ b/mhd_finance/src/main/resources/bootstrap.yml @@ -20,13 +20,13 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 - server-addr: 116.204.23.92:8848 + server-addr: 10.33.0.129:6010 +# server-addr: 116.204.23.92:8848 config: # server-addr: 127.0.0.1:8848 - server-addr: 116.204.23.92:8848 - # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 +# server-addr: 116.204.23.92:8848 +# 线上测试环境配置 容器名+端口号 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_product/Dockerfile b/mhd_product/Dockerfile index b1e41baab..2fc20258b 100644 --- a/mhd_product/Dockerfile +++ b/mhd_product/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_product/pom.xml b/mhd_product/pom.xml index 3fde65335..e665e0a44 100644 --- a/mhd_product/pom.xml +++ b/mhd_product/pom.xml @@ -149,4 +149,18 @@ + + + mhd_product + + + + com.spotify + dockerfile-maven-plugin + + + + + + diff --git a/mhd_product/src/main/resources/bootstrap.yml b/mhd_product/src/main/resources/bootstrap.yml index a3958fb96..1a8021d1d 100644 --- a/mhd_product/src/main/resources/bootstrap.yml +++ b/mhd_product/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_thrid_party/Dockerfile b/mhd_thrid_party/Dockerfile index 5f30e1148..6ba77d29c 100644 --- a/mhd_thrid_party/Dockerfile +++ b/mhd_thrid_party/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_thrid_party/pom.xml b/mhd_thrid_party/pom.xml index 7d5c8bdc4..a4341ca80 100644 --- a/mhd_thrid_party/pom.xml +++ b/mhd_thrid_party/pom.xml @@ -277,5 +277,17 @@ - + + + mhd_thrid_party + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_thrid_party/src/main/resources/bootstrap.yml b/mhd_thrid_party/src/main/resources/bootstrap.yml index 2a05ef307..a922ae813 100644 --- a/mhd_thrid_party/src/main/resources/bootstrap.yml +++ b/mhd_thrid_party/src/main/resources/bootstrap.yml @@ -18,13 +18,13 @@ spring: cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 config: - server-addr: 127.0.0.1:8848 +# server-addr: 127.0.0.1:8848 # 线上测试环境配置 容器名+端口号 - #server-addr: mhd-nacos:8848 + server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties # 共享配置 diff --git a/mhd_transport/Dockerfile b/mhd_transport/Dockerfile index 7c47729ae..f9ddb4a01 100644 --- a/mhd_transport/Dockerfile +++ b/mhd_transport/Dockerfile @@ -1,5 +1,5 @@ # 基础镜像 -FROM kdvolder/jdk8 +FROM arm64v8/openjdk:8-jre-slim # author MAINTAINER manhuoda #指定东八区时区 diff --git a/mhd_transport/pom.xml b/mhd_transport/pom.xml index 64c31ee4d..328497119 100644 --- a/mhd_transport/pom.xml +++ b/mhd_transport/pom.xml @@ -155,4 +155,17 @@ + + + mhd_transport + + + + com.spotify + dockerfile-maven-plugin + + + + + diff --git a/mhd_transport/src/main/resources/bootstrap.yml b/mhd_transport/src/main/resources/bootstrap.yml index 45d645557..464240e6c 100644 --- a/mhd_transport/src/main/resources/bootstrap.yml +++ b/mhd_transport/src/main/resources/bootstrap.yml @@ -20,10 +20,12 @@ spring: discovery: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010r server-addr: 10.33.0.129:6010 config: # server-addr: 127.0.0.1:8848 # 线上测试环境配置使用ip+端口号 +# server-addr: 10.33.0.129:6010 server-addr: 10.33.0.129:6010 group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置 file-extension: yml #默认properties diff --git a/pom.xml b/pom.xml index 8ab45146d..1762d51d6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,6 +43,13 @@ 2.13.2 3.16.2 2.7.3 + + + 3.13.0 + 3.3.1 + 3.3.1 + 1.4.13 + @@ -286,7 +293,7 @@ - + @@ -334,6 +341,104 @@ + + + + src/main/resources + true + + + + + src/test/resources + true + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${plugin.maven.compiler.version} + + ${java.version} + ${java.version} + utf-8 + + + + org.apache.maven.plugins + maven-resources-plugin + ${plugin.maven.resources.version} + + UTF-8 + + + + org.apache.maven.plugins + maven-source-plugin + ${plugin.maven.source.version} + + + attach-sources + verify + + jar-no-fork + + + + + + org.springframework.boot + spring-boot-maven-plugin + ${spring.boot.version} + + + package + + repackage + + + + + true + + + + com.spotify + dockerfile-maven-plugin + ${plugin.maven.dockerfile.version} + + + default + + build + + + + + dtyb/${project.build.finalName} + ${project.version} + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + + + org.apache.maven.plugins + maven-resources-plugin + + + org.apache.maven.plugins + maven-source-plugin + + + +