From 37baef76548062691ba9960695fee3b54e5dff95 Mon Sep 17 00:00:00 2001 From: zhoyou <18525788842@163.com> Date: Thu, 9 Jan 2020 16:03:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=88=B0docker=E5=8F=91?= =?UTF-8?q?=E5=B8=83=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base-auth/auth-server/pom.xml | 28 ++++++++++++ .../src/main/resources/application.yml | 6 +-- neuray-pm-base-server/base-center/pom.xml | 28 ++++++++++++ .../src/main/resources/application.yml | 5 ++- .../base-code-generator/pom.xml | 28 ++++++++++++ .../src/main/resources/bootstrap.yml | 4 +- .../src/main/resources/application.yml | 5 ++- .../base-gateway/gateway-server/pom.xml | 44 +++++++++++-------- .../src/main/resources/bootstrap.yml | 4 +- .../neuray-pm-provider-admin/pom.xml | 28 ++++++++++++ .../src/main/resources/application.yml | 4 +- pom.xml | 3 ++ 12 files changed, 157 insertions(+), 30 deletions(-) diff --git a/neuray-pm-base-server/base-auth/auth-server/pom.xml b/neuray-pm-base-server/base-auth/auth-server/pom.xml index 0442c9c..cb19d84 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -135,6 +135,34 @@ 1.8 + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml index f844e73..46ed62e 100644 --- a/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-auth/auth-server/src/main/resources/application.yml @@ -81,12 +81,12 @@ eureka: statusPageUrlPath: /actuator/info healthCheckUrlPath: /actuator/health # docker 部署开启 -# prefer-ip-address: true -# ip-address: 127.0.0.1 + ###docker部署开启 + prefer-ip-address: true client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-base-server/base-center/pom.xml b/neuray-pm-base-server/base-center/pom.xml index 972fcf5..a8fa24a 100644 --- a/neuray-pm-base-server/base-center/pom.xml +++ b/neuray-pm-base-server/base-center/pom.xml @@ -34,6 +34,34 @@ true + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-center/src/main/resources/application.yml b/neuray-pm-base-server/base-center/src/main/resources/application.yml index 683aaa8..f11dd99 100644 --- a/neuray-pm-base-server/base-center/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-center/src/main/resources/application.yml @@ -10,4 +10,7 @@ eureka: registerWithEureka: false #false:不作为一个客户端注册到注册中心 fetchRegistry: false #为true时，可以启动，但报异常：Cannot execute request on any known server service-url: - defaultZone: http://127.0.0.1:8070/eureka + defaultZone: http://192.168.1.205:8070/eureka + ###docker部署开启 + instance: + prefer-ip-address: true diff --git a/neuray-pm-base-server/base-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index 4cd16e3..3033316 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -117,6 +117,34 @@ true + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml index 5c98689..5c63a2e 100644 --- a/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-code-generator/src/main/resources/bootstrap.yml @@ -4,12 +4,12 @@ eureka: healthCheckUrlPath: /actuator/health home-page-url-path: / # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml index 91dd44e..f9c2caa 100644 --- a/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml +++ b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml @@ -40,9 +40,12 @@ server: active: dev #eruka注册中心 eureka: + ###docker部署开启 + instance: + prefer-ip-address: true client: service-url: - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml index 1c3f7ec..0f779a3 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -86,32 +86,38 @@ org.apache.maven.plugins - maven-resources-plugin + maven-compiler-plugin + + 1.8 + 1.8 + + + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} - prepare-dockerfile - validate + build-image + package - copy-resources + build - - ${project.build.directory}/docker - - - ${project.basedir}/src/main/docker - true - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 1.8 - 1.8 + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar", "-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + diff --git a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml index b8789d6..dd6012b 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml +++ b/neuray-pm-base-server/base-gateway/gateway-server/src/main/resources/bootstrap.yml @@ -4,12 +4,12 @@ eureka: healthCheckUrlPath: /actuator/health home-page-url-path: / # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index d48b71f..f861113 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/pom.xml +++ b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml @@ -85,6 +85,34 @@ 1.8 + + com.spotify + docker-maven-plugin + ${docker.maven.plugin.version} + + + build-image + package + + build + + + + + ${docker.pre}/${project.artifactId}:${project.version} + ${docker.host} + java:8 + ["java", "-jar","-Dspring.profiles.active=prod","/${project.build.finalName}.jar"] + + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + diff --git a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml index b05380e..660caa5 100644 --- a/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml +++ b/neuray-pm-provider/neuray-pm-provider-admin/src/main/resources/application.yml @@ -53,12 +53,12 @@ eureka: statusPageUrlPath: /actuator/info healthCheckUrlPath: /actuator/health # docker 部署开启 -# prefer-ip-address: true + prefer-ip-address: true # ip-address: 127.0.0.1 client: serviceUrl: # docker 部署开启 - defaultZone: http://${EUREKA_HOST:localhost}:${EUREKA_PORT:8070}/eureka/ + defaultZone: http://${EUREKA_HOST:192.168.1.205}:${EUREKA_PORT:8070}/eureka/ ###向注册中心上注册自己 register-with-eureka: true ###是否需要从eureka上获取注册信息 diff --git a/pom.xml b/pom.xml index c8ecc28..941a3a7 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,9 @@ 3.4.1 1.8 1.8 + neuray-pm + http://192.168.1.205:2375 + 1.1.0 -- Gitee From c1b90cbe95e93900f1d84b34b7ab14b08de4815c Mon Sep 17 00:00:00 2001 From: zhoyou Date: Mon, 13 Jan 2020 15:43:32 +0800 Subject: [PATCH 2/2] update README.md. --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 60f4332..e9cd484 100644 --- a/README.md +++ b/README.md @@ -63,3 +63,5 @@ - 本项目Docker镜像构建请参考：[使用Maven插件为SpringBoot应用构建Docker镜像](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_maven.md)； - 本项目在Docker容器下的部署请参考：[mall在Linux环境下的部署（基于Docker容器）](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_file.md)； - 本项目使用Docker Compose请参考： [mall在Linux环境下的部署（基于Docker Compose）](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_compose.md)。 + +装载使用jenkins[https://www.cnblogs.com/sxdcgaq8080/p/10569906.html](https://www.cnblogs.com/sxdcgaq8080/p/10569906.html) -- Gitee