diff --git a/all-in-one/src/main/resources/application-dev.yml b/all-in-one/src/main/resources/application-dev.yml index 9698b19..029329c 100644 --- a/all-in-one/src/main/resources/application-dev.yml +++ b/all-in-one/src/main/resources/application-dev.yml @@ -45,7 +45,7 @@ spring: login-username: micro login-password: fast reset-enable: true - allow: 127.0.0.1,172.17.0.1 + allow: 127.0.0.1,172.19.0.1 deny: 127.0.0.2 enabled: true url-pattern: /druid/* diff --git a/ms/.env b/ms/.env new file mode 100644 index 0000000..93cf410 --- /dev/null +++ b/ms/.env @@ -0,0 +1 @@ +PROFILE=dev \ No newline at end of file diff --git a/ms/config-server/Dockerfile b/ms/config-server/Dockerfile index 638cb7d..52b4d04 100644 --- a/ms/config-server/Dockerfile +++ b/ms/config-server/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-config-server.jar /workhome/app.jar +ADD ./target/ms-config-server.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10000 EXPOSE 10001 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/config-server/cmd-dev.sh b/ms/config-server/cmd-dev.sh new file mode 100755 index 0000000..b0b05fe --- /dev/null +++ b/ms/config-server/cmd-dev.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ +app.jar diff --git a/ms/config-server/container_settings.json b/ms/config-server/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/config-server/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/config-server/docker-run-config-server.sh b/ms/config-server/docker-run-config-server.sh deleted file mode 100755 index acf2a38..0000000 --- a/ms/config-server/docker-run-config-server.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10000:10000 -p 10001:10001 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT \ - java -jar \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - /workhome/app.jar \ No newline at end of file diff --git a/ms/config-server/src/main/resources/log4j2-dev.xml b/ms/config-server/src/main/resources/log4j2-dev.xml index ef00409..ea8362d 100644 --- a/ms/config-server/src/main/resources/log4j2-dev.xml +++ b/ms/config-server/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/docker-compose.yml b/ms/docker-compose.yml index 139597f..6737ea0 100644 --- a/ms/docker-compose.yml +++ b/ms/docker-compose.yml @@ -1,2 +1,79 @@ +# docker-compose主要用于编排多个容器组成的应用,可以使用docker-compose 运行,也可以使用swram运行 +version: '2' +services: +# mysql数据库 + mysql: + image: mysql:5.7 + volumes: + - /opt/mysql-master:/var/lib/mysql + networks: + - backend + environment: + MYSQL_ROOT_PASSWORD: studyj2e + command: ["--character-set-server=utf8mb4","--collation-server=utf8mb4_unicode_ci"] +# redis + redis: + image: redis:latest + networks: + - backend +# rabbitmq + rabbitmq: + image: rabbitmq:3 + networks: + - backend +# 配置中心 + ms-config-server: + image: "registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-config-serverV0.0.1-SNAPSHOT" + networks: + - backend + working_dir: /workhome + command: ["./cmd-${PROFILE}.sh","ms-register-center1","ms-register-center2"] +# 注册中心 + ms-register-center1: + image: "registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT" + networks: + - backend + depends_on: + - ms-config-server + working_dir: /workhome + command: ["./cmd-${PROFILE}.sh","ms-register-center1","ms-register-center2","ms-config-server"] + ms-register-center2: + image: "registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT" + networks: + - backend + depends_on: + - ms-config-server + working_dir: /workhome + command: ["./cmd-${PROFILE}.sh","ms-register-center1","ms-register-center2","ms-config-server"] + ms-gateway: + image: "registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT" + expose: + - 10006 + ports: + - "10006:10006" + networks: + - backend + depends_on: + - rabbitmq + - redis + - ms-register-center1 + - ms-register-center2 + working_dir: /workhome + command: ["./cmd-${PROFILE}.sh","ms-register-center1","ms-register-center2","redis","6379","rabbitmq","5672"] + ms-upms: + image: "registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT" + networks: + - backend + depends_on: + - mysql + - redis + - rabbitmq + - ms-register-center1 + - ms-register-center2 + working_dir: /workhome + command: ["./cmd-${PROFILE}.sh","ms-register-center1","ms-register-center2","redis","6379","rabbitmq","5672","mysql:3306"] +# 自定义网络,port-前端网络,backend后端网络 +networks: + backend: diff --git a/ms/docker-image-build-ms.sh b/ms/docker-image-build-ms.sh index 7aa70bc..308e569 100755 --- a/ms/docker-image-build-ms.sh +++ b/ms/docker-image-build-ms.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cd ../config-server/ +cd ./config-server/ mvn docker:build cd ../gateway/ mvn docker:build @@ -11,4 +11,9 @@ cd ../ucenter/ mvn docker:build cd ../upms/ mvn docker:build +cd ../oauth/ +mvn docker:build +cd ../monitor-turbine/ +mvn docker:build +cd ../monitor-zipkin/ diff --git a/ms/docker-image-push-ms.sh b/ms/docker-image-push-ms.sh index 2f9fb2d..ad7a33a 100755 --- a/ms/docker-image-push-ms.sh +++ b/ms/docker-image-push-ms.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cd ../config-server/ +cd ./config-server/ mvn docker:push cd ../gateway/ mvn docker:push @@ -11,4 +11,10 @@ cd ../ucenter/ mvn docker:push cd ../upms/ mvn docker:push +cd ../oauth/ +mvn docker:push +cd ../monitor-turbine/ +mvn docker:push +cd ../monitor-zipkin/ +mvn docker:push diff --git a/ms/docker-image-remove-ms.sh b/ms/docker-image-remove-ms.sh index d87879d..df49604 100755 --- a/ms/docker-image-remove-ms.sh +++ b/ms/docker-image-remove-ms.sh @@ -1,5 +1,5 @@ #!/usr/bin/env bash -cd ../config-server/ +cd ./config-server/ mvn docker:removeImage cd ../gateway/ mvn docker:removeImage @@ -11,4 +11,8 @@ cd ../ucenter/ mvn docker:removeImage cd ../upms/ mvn docker:removeImage - +cd ../oauth/ +mvn docker:removeImage +cd ../monitor-turbine/ +mvn docker:removeImage +cd ../monitor-zipkin/ diff --git a/ms/gateway/Dockerfile b/ms/gateway/Dockerfile index 0378b51..0480e0e 100644 --- a/ms/gateway/Dockerfile +++ b/ms/gateway/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-gateway.jar /workhome/app.jar +ADD ./target/ms-gateway.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10006 EXPOSE 10007 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/gateway/cmd-dev.sh b/ms/gateway/cmd-dev.sh new file mode 100644 index 0000000..ea0070b --- /dev/null +++ b/ms/gateway/cmd-dev.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +redisHost=$3 +redisPort=$4 +rabbitHost=$5 +rabbitPort=$6 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.redis.host=${redisHost} \ + -Dspring.redis.port=${redisPort} \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ +app.jar diff --git a/ms/gateway/container_settings.json b/ms/gateway/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/gateway/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/gateway/docker-run-gateway.sh b/ms/gateway/docker-run-gateway.sh deleted file mode 100755 index 2752d54..0000000 --- a/ms/gateway/docker-run-gateway.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10006:10006 -p 10007:10007 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-gatewayV0.0.1-SNAPSHOT \ - java -jar \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - -Dspring.cloud.config.profile=deploy \ - /workhome/app.jar \ No newline at end of file diff --git a/ms/gateway/src/main/resources/log4j2-dev.xml b/ms/gateway/src/main/resources/log4j2-dev.xml index ef141a5..42dadd0 100644 --- a/ms/gateway/src/main/resources/log4j2-dev.xml +++ b/ms/gateway/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/monitor-turbine/Dockerfile b/ms/monitor-turbine/Dockerfile new file mode 100644 index 0000000..946af7d --- /dev/null +++ b/ms/monitor-turbine/Dockerfile @@ -0,0 +1,11 @@ +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 +ADD ./target/ms-monitor-turbine.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10008 +EXPOSE 10009 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] diff --git a/ms/monitor-turbine/cmd-dev.sh b/ms/monitor-turbine/cmd-dev.sh new file mode 100644 index 0000000..3bc31b5 --- /dev/null +++ b/ms/monitor-turbine/cmd-dev.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +rabbitHost=$3 +rabbitPort=$4 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ +app.jar diff --git a/ms/monitor-turbine/container_settings.json b/ms/monitor-turbine/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/monitor-turbine/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/monitor-turbine/src/main/resources/log4j2-dev.xml b/ms/monitor-turbine/src/main/resources/log4j2-dev.xml index e355a3f..b94f9cf 100644 --- a/ms/monitor-turbine/src/main/resources/log4j2-dev.xml +++ b/ms/monitor-turbine/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/monitor-zipkin/Dockerfile b/ms/monitor-zipkin/Dockerfile new file mode 100644 index 0000000..051c642 --- /dev/null +++ b/ms/monitor-zipkin/Dockerfile @@ -0,0 +1,11 @@ +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 +ADD ./target/ms-monitor-zipkin.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10008 +EXPOSE 10009 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/monitor-zipkin/cmd-dev.sh b/ms/monitor-zipkin/cmd-dev.sh new file mode 100644 index 0000000..3bc31b5 --- /dev/null +++ b/ms/monitor-zipkin/cmd-dev.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +rabbitHost=$3 +rabbitPort=$4 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ +app.jar diff --git a/ms/monitor-zipkin/container_settings.json b/ms/monitor-zipkin/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/monitor-zipkin/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml b/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml index e355a3f..b94f9cf 100644 --- a/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml +++ b/ms/monitor-zipkin/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/oauth/Dockerfile b/ms/oauth/Dockerfile new file mode 100644 index 0000000..17382bd --- /dev/null +++ b/ms/oauth/Dockerfile @@ -0,0 +1,11 @@ +FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 +ADD ./target/ms-oauth.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh +ENV JAVA_HOME /opt/lib/jdk1.8.0_144 +ENV JAVA_JRE ${JAVA_HOME}/jre +ENV PATH ${JAVA_HOME}/bin:$PATH +EXPOSE 10008 +EXPOSE 10009 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/oauth/cmd-dev.sh b/ms/oauth/cmd-dev.sh new file mode 100644 index 0000000..ea0070b --- /dev/null +++ b/ms/oauth/cmd-dev.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +redisHost=$3 +redisPort=$4 +rabbitHost=$5 +rabbitPort=$6 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.redis.host=${redisHost} \ + -Dspring.redis.port=${redisPort} \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ +app.jar diff --git a/ms/oauth/container_settings.json b/ms/oauth/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/oauth/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/oauth/src/main/resources/log4j2-dev.xml b/ms/oauth/src/main/resources/log4j2-dev.xml index 1e6a1b6..da1dbf8 100644 --- a/ms/oauth/src/main/resources/log4j2-dev.xml +++ b/ms/oauth/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/register-center1/Dockerfile b/ms/register-center1/Dockerfile index b0002f6..30384a1 100644 --- a/ms/register-center1/Dockerfile +++ b/ms/register-center1/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-register-center1.jar /workhome/app.jar +ADD ./target/ms-register-center1.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10002 EXPOSE 10003 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/register-center1/cmd-dev.sh b/ms/register-center1/cmd-dev.sh new file mode 100644 index 0000000..0bc6705 --- /dev/null +++ b/ms/register-center1/cmd-dev.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +configserver=$3 +sleep 60 && java -jar \ +-Xms200m -Xmx200m \ +-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Dspring.cloud.config.uri=http://config:server@${configserver}:10000/ \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.cloud.config.profile=deploy \ + /workhome/app.jar +app.jar \ No newline at end of file diff --git a/ms/register-center1/container_settings.json b/ms/register-center1/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/register-center1/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/register-center1/docker-run-register-center1.sh b/ms/register-center1/docker-run-register-center1.sh deleted file mode 100755 index 903854f..0000000 --- a/ms/register-center1/docker-run-register-center1.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10002:10002 -p 10003:10003 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center1V0.0.1-SNAPSHOT \ - java -jar \ - -Dspring.cloud.config.uri=http://config:server@172.17.0.1:10000/ \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10004/eureka \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - -Dspring.cloud.config.profile=deploy \ - /workhome/app.jar diff --git a/ms/register-center1/src/main/resources/log4j2-dev.xml b/ms/register-center1/src/main/resources/log4j2-dev.xml index 11a3493..8ca67c3 100644 --- a/ms/register-center1/src/main/resources/log4j2-dev.xml +++ b/ms/register-center1/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/register-center2/Dockerfile b/ms/register-center2/Dockerfile index ff9e7af..84a7c71 100644 --- a/ms/register-center2/Dockerfile +++ b/ms/register-center2/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-register-center2.jar /workhome/app.jar +ADD ./target/ms-register-center2.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10004 EXPOSE 10005 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/register-center2/cmd-dev.sh b/ms/register-center2/cmd-dev.sh new file mode 100644 index 0000000..db359d9 --- /dev/null +++ b/ms/register-center2/cmd-dev.sh @@ -0,0 +1,13 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +configserver=$3 +sleep 60 && java -jar \ +-Xms200m -Xmx200m \ +-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Dspring.cloud.config.uri=http://config:server@${configserver}:10000/ \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.cloud.config.profile=deploy \ + /workhome/app.jar +app.jar diff --git a/ms/register-center2/container_settings.json b/ms/register-center2/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/register-center2/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/register-center2/docker-run-register-center2.sh b/ms/register-center2/docker-run-register-center2.sh deleted file mode 100755 index 028bec7..0000000 --- a/ms/register-center2/docker-run-register-center2.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10004:10004 -p 10005:10005 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-register-center2V0.0.1-SNAPSHOT \ - java -jar \ - -Dspring.cloud.config.uri=http://config:server@172.17.0.1:10000/ \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - -Dspring.cloud.config.profile=deploy \ - /workhome/app.jar \ No newline at end of file diff --git a/ms/register-center2/src/main/resources/log4j2-dev.xml b/ms/register-center2/src/main/resources/log4j2-dev.xml index 81f0da6..70c2e0b 100644 --- a/ms/register-center2/src/main/resources/log4j2-dev.xml +++ b/ms/register-center2/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/ucenter/Dockerfile b/ms/ucenter/Dockerfile index e61122d..40ea314 100644 --- a/ms/ucenter/Dockerfile +++ b/ms/ucenter/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-ucenter.jar /workhome/app.jar +ADD ./target/ms-ucenter.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10010 EXPOSE 10011 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/ucenter/cmd-dev.sh b/ms/ucenter/cmd-dev.sh new file mode 100644 index 0000000..b0dbcf5 --- /dev/null +++ b/ms/ucenter/cmd-dev.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +redisHost=$3 +redisPort=$4 +rabbitHost=$5 +rabbitPort=$6 +mysqlUrl=$7 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.redis.host=${redisHost} \ + -Dspring.redis.port=${redisPort} \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ + -Dspring.datasource.druid.url='jdbc:mysql://'+${mysqlUrl}+'/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false' \ + -Dspring.datasource.druid.master.url='jdbc:mysql://'+${mysqlUrl}+'/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false' \ +app.jar diff --git a/ms/ucenter/container_settings.json b/ms/ucenter/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/ucenter/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/ucenter/docker-run-ucenter.sh b/ms/ucenter/docker-run-ucenter.sh deleted file mode 100755 index e58a22a..0000000 --- a/ms/ucenter/docker-run-ucenter.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10010:10010 -p 10011:10011 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-ucenterV0.0.1-SNAPSHOT \ - java -jar \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - -Dspring.cloud.config.profile=deploy \ - /workhome/app.jar \ No newline at end of file diff --git a/ms/ucenter/src/main/resources/log4j2-dev.xml b/ms/ucenter/src/main/resources/log4j2-dev.xml index 282e617..336a9a6 100644 --- a/ms/ucenter/src/main/resources/log4j2-dev.xml +++ b/ms/ucenter/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/ms/upms/Dockerfile b/ms/upms/Dockerfile index 14a383e..10c39db 100644 --- a/ms/upms/Dockerfile +++ b/ms/upms/Dockerfile @@ -1,7 +1,11 @@ FROM registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:javaV0.0.1 -ADD ms-upms.jar /workhome/app.jar +ADD ./target/ms-upms.jar /workhome/app.jar +ADD ./cmd-dev.sh /workhome/cmd-dev.sh +RUN set -xe && chmod u+x /workhome/cmd-dev.sh ENV JAVA_HOME /opt/lib/jdk1.8.0_144 ENV JAVA_JRE ${JAVA_HOME}/jre ENV PATH ${JAVA_HOME}/bin:$PATH EXPOSE 10008 EXPOSE 10009 +WORKDIR /workhome +CMD ["java","-jar","-Xms200m", "-Xmx200m","-agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y","app.jar"] \ No newline at end of file diff --git a/ms/upms/cmd-dev.sh b/ms/upms/cmd-dev.sh new file mode 100644 index 0000000..9cb9cb2 --- /dev/null +++ b/ms/upms/cmd-dev.sh @@ -0,0 +1,20 @@ +#!/usr/bin/env bash +register1=$1 +register2=$2 +redisHost=$3 +redisPort=$4 +rabbitHost=$5 +rabbitPort=$6 +mysqlUrl=$7 +sleep 120 && java -jar \ +-Xms200m -Xmx200m \ + -agentlib:jdwp=transport=dt_socket,address=6001,suspend=n,server=y \ + -Deureka.client.serviceUrl.defaultZone=http://micro:fast@:${register1}10002/eureka/,http://micro:fast@${register2}:10004/eureka/ \ + -Deureka.instance.prefer-ip-address=true \ + -Dspring.redis.host=${redisHost} \ + -Dspring.redis.port=${redisPort} \ + -Dspring.rabbitmq.host=${rabbitHost} \ + -Dspring.rabbitmq.port=${rabbitPort} \ + -Dspring.datasource.druid.url='jdbc:mysql://'+${mysqlUrl}+'/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false' \ + -Dspring.datasource.druid.master.url='jdbc:mysql://'+${mysqlUrl}+'/micro?useUncoide=true&chracterEncoding=utf-8&useSSL=false' \ + app.jar diff --git a/ms/upms/container_settings.json b/ms/upms/container_settings.json new file mode 100644 index 0000000..2960d42 --- /dev/null +++ b/ms/upms/container_settings.json @@ -0,0 +1,7 @@ +{ + "_comment": "FOR DETAILED FORMAT LOOK AT https://docs.docker.com/engine/api/v1.22/#create-a-container", + "AttachStdin": true, + "OpenStdin": true, + "HostConfig": { + } +} \ No newline at end of file diff --git a/ms/upms/docker-run-upms.sh b/ms/upms/docker-run-upms.sh deleted file mode 100755 index b96fc6f..0000000 --- a/ms/upms/docker-run-upms.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -docker run -d -p 10008:10008 -p 10009:10009 registry.cn-hangzhou.aliyuncs.com/lishouyu/hub:ms-upmsV0.0.1-SNAPSHOT \ - java -jar \ - -Deureka.client.serviceUrl.defaultZone=http://micro:fast@172.17.0.1:10002/eureka/,http://micro:fast@172.17.0.1:10004/eureka/ \ - -Deureka.instance.prefer-ip-address=true \ - -Deureka.instance.ip-address=172.17.0.1 \ - -Dspring.cloud.config.profile=deploy \ - /workhome/app.jar diff --git a/ms/upms/src/main/resources/log4j2-dev.xml b/ms/upms/src/main/resources/log4j2-dev.xml index 7776a02..a6bad74 100644 --- a/ms/upms/src/main/resources/log4j2-dev.xml +++ b/ms/upms/src/main/resources/log4j2-dev.xml @@ -2,7 +2,7 @@ - + diff --git a/pom.xml b/pom.xml index 56f3ec3..749cb4d 100644 --- a/pom.xml +++ b/pom.xml @@ -395,13 +395,13 @@ registry.cn-hangzhou.aliyuncs.com - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - + + + + + + +