diff --git a/README.md b/README.md index 2773472df4527cc88df3f7df4464e796d4416bfe..e9cd484693408eba9b3e4311150ba892f643d352 100644 --- a/README.md +++ b/README.md @@ -58,6 +58,10 @@ ### 搭建步骤 > Docker环境部署 -- 启动本项目docker命令参考:[启动本项目docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker_neuray_pm.md)); - 在VirtualBox或其他环境中安装CenterOs7.6; -- Docker环境的安装请参考:[开发者必备Docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker.md) +- Docker环境的安装请参考:[开发者必备Docker命令](https://gitee.com/zhhongyu/neuray-pm-security/blob/master/docs/docker/docker.md); +- 本项目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) 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 20f8793cb42f721ddaf73a655311d61ec5345ec1..cf6615b3dad133c5484a63d0b812ff12549d067d 100644 --- a/neuray-pm-base-server/base-auth/auth-server/pom.xml +++ b/neuray-pm-base-server/base-auth/auth-server/pom.xml @@ -143,6 +143,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-code-generator/pom.xml b/neuray-pm-base-server/base-code-generator/pom.xml index d028b5509a35e008567aeee9faf98d0d9e20946a..b9063f6027d9667ae8f1a9d444fe1a5fd4ade224 100644 --- a/neuray-pm-base-server/base-code-generator/pom.xml +++ b/neuray-pm-base-server/base-code-generator/pom.xml @@ -126,6 +126,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-dfsfile-client/src/main/resources/application.yml b/neuray-pm-base-server/base-dfsfile-client/src/main/resources/application.yml index 91dd44ed8a3c7e71f3cf571e49b2ef3912db2161..f9c2caa71788a7a4b36018e0ca0e9e0af79bbb69 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 5e78b28d1c3444341e24b3ed9c1eb1868c0319b7..bee6f17605f10a9162e0a78ea70335299e9f951c 100644 --- a/neuray-pm-base-server/base-gateway/gateway-server/pom.xml +++ b/neuray-pm-base-server/base-gateway/gateway-server/pom.xml @@ -95,32 +95,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-provider/neuray-pm-provider-admin/pom.xml b/neuray-pm-provider/neuray-pm-provider-admin/pom.xml index d48b71f60d2f2e470682dec07e674e18b9b5484b..f861113982088dce1f93cde3004323ee38886bd1 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/pom.xml b/pom.xml index c8ecc28db5fb746a72bc8a31fee3490568eb7825..941a3a73b30fe54c68e26788b7596a84b71f701e 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