diff --git a/all/deployBash/activemq_start.sh b/all/deployBash/activemq_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/activemq_stop.sh b/all/deployBash/activemq_stop.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/config/devBinPath.sh b/all/deployBash/config/devBinPath.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/docker_shipyarn_start.sh b/all/deployBash/docker_shipyarn_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/docker_shipyarn_stop.sh b/all/deployBash/docker_shipyarn_stop.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/dump.rdb b/all/deployBash/dump.rdb old mode 100644 new mode 100755 diff --git a/all/deployBash/fastdfs_start.sh b/all/deployBash/fastdfs_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/lib/execTemplate.sh b/all/deployBash/lib/execTemplate.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/lib/isHaveAndBinPathTrue.sh b/all/deployBash/lib/isHaveAndBinPathTrue.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/lib/isOK.sh b/all/deployBash/lib/isOK.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/lib/isRunning.sh b/all/deployBash/lib/isRunning.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/micro_fast_start.sh b/all/deployBash/micro_fast_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/micro_fast_stop.sh b/all/deployBash/micro_fast_stop.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/nginx_start.sh b/all/deployBash/nginx_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/nginx_stop.sh b/all/deployBash/nginx_stop.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/redis_server_start.sh b/all/deployBash/redis_server_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/vsftpd_start.sh b/all/deployBash/vsftpd_start.sh old mode 100644 new mode 100755 diff --git a/all/deployBash/vsftpd_stop.sh b/all/deployBash/vsftpd_stop.sh old mode 100644 new mode 100755 diff --git a/all/docker/java/java-image-build.sh b/all/docker/java/java-image-build.sh new file mode 100644 index 0000000..2e868b3 --- /dev/null +++ b/all/docker/java/java-image-build.sh @@ -0,0 +1,2 @@ +#!/usr/bin/env bash +docker build -t java:v0.0.1 . \ No newline at end of file diff --git a/ms/README.md b/ms/README.md index 0da0de2..89cc7c7 100644 --- a/ms/README.md +++ b/ms/README.md @@ -6,10 +6,10 @@ ## 模块介绍 ### 配置中心 config-server 配置中心默认启动端口号9999,健康检查端口号19999.访问地址www.config.server.com -### 注册中心 eureka-server +### 注册中心 register-center1 注册中心默认启动端口号10002,健康检查端口号20002.访问地址www.eureka.server.com.为保证服务的稳定可靠,可以创建多个注册中心,实现服务注 册的备份冗余,实现高可用性 -### 注册中心2 eureka-server2 +### 注册中心2 register-center2 注册中心2默认启动端口号10003,健康检查端口号20003.访问地址www.eureka.server2.com ### 用户权限管理中心 upms 用户权限管理中心默认启动端口号10004,健康检查端口号20004.访问地址www.upms.com diff --git a/ms/cms/Dockerfile b/ms/cms/Dockerfile new file mode 100644 index 0000000..8ba02e5 --- /dev/null +++ b/ms/cms/Dockerfile @@ -0,0 +1,9 @@ +FROM java:v0.0.1 +ADD ms-cms.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10005 +EXPOSE 20005 +WORKDIR /workhome +CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/cms/docker-image-build.sh b/ms/cms/docker-image-build.sh new file mode 100755 index 0000000..d3f8197 --- /dev/null +++ b/ms/cms/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-cms +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/cms/pom.xml b/ms/cms/pom.xml index 07637c7..901e618 100644 --- a/ms/cms/pom.xml +++ b/ms/cms/pom.xml @@ -125,6 +125,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + + com.spotify + docker-maven-plugin ms-cms diff --git a/ms/config-server/Dockerfile b/ms/config-server/Dockerfile index b8e7905..9352b2d 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -1,9 +1,9 @@ -FROM java -ADD ./target/config-server-0.0.1-SNAPSHOT.jar /home/app.jar -ENV JAVA_HOME /usr/lib/jdk +FROM java:v0.0.1 +ADD ms-config-server.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH -EXPOSE 10001 -EXPOSE 20001 -WORKDIR /home +EXPOSE 9999 +EXPOSE 19999 +WORKDIR /workhome CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/config-server/docker-image-build.sh b/ms/config-server/docker-image-build.sh new file mode 100644 index 0000000..157f632 --- /dev/null +++ b/ms/config-server/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-config-server +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/config-server/pom.xml b/ms/config-server/pom.xml index a9fdbf8..af7fa24 100644 --- a/ms/config-server/pom.xml +++ b/ms/config-server/pom.xml @@ -54,6 +54,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + com.spotify + docker-maven-plugin + ms-config-server diff --git a/docker-compose.yml b/ms/docker-compose.yml similarity index 100% rename from docker-compose.yml rename to ms/docker-compose.yml diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile new file mode 100644 index 0000000..00e97aa --- /dev/null +++ b/ms/gateway/Dockerfile @@ -0,0 +1,9 @@ +FROM java:v0.0.1 +ADD ms-gateway.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10007 +EXPOSE 20007 +WORKDIR /workhome +CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/gateway/docker-image-build.sh b/ms/gateway/docker-image-build.sh new file mode 100644 index 0000000..eea3bc9 --- /dev/null +++ b/ms/gateway/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-gateway +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/gateway/pom.xml b/ms/gateway/pom.xml index 933b71b..e984966 100644 --- a/ms/gateway/pom.xml +++ b/ms/gateway/pom.xml @@ -107,6 +107,10 @@ org.springframework.boot spring-boot-maven-plugin + + com.spotify + docker-maven-plugin + ms-gateway diff --git a/ms/ms-docker-image-build.sh b/ms/ms-docker-image-build.sh new file mode 100755 index 0000000..6aae679 --- /dev/null +++ b/ms/ms-docker-image-build.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env bash + +cd cms +source ms-docker-image-build.sh + +cd ../config-server/ +source ms-docker-image-build.sh + +cd ../gateway/ +source ms-docker-image-build.sh + +cd ../register-center1/ +source ms-docker-image-build.sh + +cd ../register-center2/ +source ms-docker-image-build.sh + +cd ../ucenter/ +source ms-docker-image-build.sh + +cd ../upms/ +source ms-docker-image-build.sh + diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index 63d5890..571edd9 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -1,9 +1,9 @@ -FROM java -ADD ./target/eureka-server-0.0.1-SNAPSHOT.jar /home/app.jar -ENV JAVA_HOME /usr/lib/jdk +FROM java:v0.0.1 +ADD ms-register-center1.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10002 EXPOSE 20002 -WORKDIR /home +WORKDIR /workhome CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/register-center1/docker-image-build.sh b/ms/register-center1/docker-image-build.sh new file mode 100644 index 0000000..c3e0649 --- /dev/null +++ b/ms/register-center1/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-register-center1 +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center1/pom.xml b/ms/register-center1/pom.xml index 2e1b5c2..d08e666 100644 --- a/ms/register-center1/pom.xml +++ b/ms/register-center1/pom.xml @@ -63,6 +63,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + com.spotify + docker-maven-plugin + ms-register-center1 diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index 06b6a7d..a5b3858 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -1,9 +1,9 @@ -FROM springboot:v1 -ADD ./target/eureka-server2-0.0.1-SNAPSHOT.jar /home/app.jar -ENV JAVA_HOME /usr/lib/jdk +FROM java:v0.0.1 +ADD ms-register-center2.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10003 EXPOSE 20003 -WORKDIR /home +WORKDIR /workhome CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/register-center2/docker-image-build.sh b/ms/register-center2/docker-image-build.sh new file mode 100644 index 0000000..63613a9 --- /dev/null +++ b/ms/register-center2/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-register-center2 +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/register-center2/pom.xml b/ms/register-center2/pom.xml index 2cfc3eb..0f9937d 100644 --- a/ms/register-center2/pom.xml +++ b/ms/register-center2/pom.xml @@ -63,6 +63,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + com.spotify + docker-maven-plugin + ms-register-center2 diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile new file mode 100644 index 0000000..79407d7 --- /dev/null +++ b/ms/ucenter/Dockerfile @@ -0,0 +1,9 @@ +FROM java:v0.0.1 +ADD ms-ucenter.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10006 +EXPOSE 20006 +WORKDIR /workhome +CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/ucenter/docker-image-build.sh b/ms/ucenter/docker-image-build.sh new file mode 100644 index 0000000..630fe6f --- /dev/null +++ b/ms/ucenter/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-ucenter +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/ucenter/pom.xml b/ms/ucenter/pom.xml index 9c13187..33e4eb8 100644 --- a/ms/ucenter/pom.xml +++ b/ms/ucenter/pom.xml @@ -138,6 +138,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + com.spotify + docker-maven-plugin + ms-ucenter diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 40f76e2..cc4176e 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -1,9 +1,9 @@ -FROM springboot:v1 -ADD ./target/upms-0.0.1-SNAPSHOT.jar /home/app.jar -ENV JAVA_HOME /usr/lib/jdk +FROM java:v0.0.1 +ADD ms-upms.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10004 EXPOSE 20004 -WORKDIR /home +WORKDIR /workhome CMD ["java","-jar","app.jar"] \ No newline at end of file diff --git a/ms/upms/docker-image-build.sh b/ms/upms/docker-image-build.sh new file mode 100644 index 0000000..0c36304 --- /dev/null +++ b/ms/upms/docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f ms-upms +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/ms/upms/pom.xml b/ms/upms/pom.xml index 2521820..427c05d 100644 --- a/ms/upms/pom.xml +++ b/ms/upms/pom.xml @@ -130,6 +130,10 @@ org.apache.maven.plugins maven-javadoc-plugin + + com.spotify + docker-maven-plugin + ms-upms diff --git a/pa/Dockerfile b/pa/Dockerfile index e69de29..39b0515 100644 --- a/pa/Dockerfile +++ b/pa/Dockerfile @@ -0,0 +1,8 @@ +FROM java:v0.0.1 +ADD micro-fast-pa.jar /workhome/app.jar +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 8080 +WORKDIR /workhome +CMD ["java","-jar","app.jar"] diff --git a/pa/pa-docker-image-build.sh b/pa/pa-docker-image-build.sh new file mode 100644 index 0000000..0813b65 --- /dev/null +++ b/pa/pa-docker-image-build.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +docker rmi -f micro-fast-pa +mvn package docker:build -Dmaven.test.skip=true \ No newline at end of file diff --git a/pa/pom.xml b/pa/pom.xml index 6a072a3..fc49dbb 100644 --- a/pa/pom.xml +++ b/pa/pom.xml @@ -55,17 +55,6 @@ com.spotify docker-maven-plugin - - ${project.build.finalName} - ${project.basedir} - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - - micro-fast-pa diff --git a/pom.xml b/pom.xml index b17c5df..3158c88 100644 --- a/pom.xml +++ b/pom.xml @@ -276,6 +276,17 @@ com.spotify docker-maven-plugin ${docker.maven.plugin.version} + + ${project.build.finalName} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + +