diff --git a/pigx-auth/Dockerfile b/pigx-auth/Dockerfile index e84cc1964..459b6d3bb 100644 --- a/pigx-auth/Dockerfile +++ b/pigx-auth/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-auth EXPOSE 3000 -ADD ./pigx-auth/target/pigx-auth.jar ./ +ADD ./target/pigx-auth.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-auth.jar diff --git a/pigx-auth/pom.xml b/pigx-auth/pom.xml index f67265eea..38ccae031 100644 --- a/pigx-auth/pom.xml +++ b/pigx-auth/pom.xml @@ -100,6 +100,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-auth/src/main/resources/bootstrap.yml b/pigx-auth/src/main/resources/bootstrap.yml index aed68dfa4..4a98cab0c 100644 --- a/pigx-auth/src/main/resources/bootstrap.yml +++ b/pigx-auth/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-config/Dockerfile b/pigx-config/Dockerfile index fead92d09..094ff3bc2 100644 --- a/pigx-config/Dockerfile +++ b/pigx-config/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-config EXPOSE 4001 -ADD ./pigx-config/target/pigx-config.jar ./ +ADD ./target/pigx-config.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-config.jar diff --git a/pigx-config/pom.xml b/pigx-config/pom.xml index 93c74f180..24cebf28f 100644 --- a/pigx-config/pom.xml +++ b/pigx-config/pom.xml @@ -69,6 +69,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-config/src/main/resources/bootstrap.yml b/pigx-config/src/main/resources/bootstrap.yml index 5564b817f..b175a2426 100644 --- a/pigx-config/src/main/resources/bootstrap.yml +++ b/pigx-config/src/main/resources/bootstrap.yml @@ -19,7 +19,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ # 暴露监控端点 management: diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 01bf8a6cb..fe48e9322 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -2,7 +2,7 @@ spring: redis: password: - host: localhost + host: redis # 暴露监控端点 management: endpoints: @@ -93,7 +93,7 @@ swagger: ## spring security 配置 security: auth: - server: http://localhost:9999/auth/oauth + server: http://pigx-gateway:9999/auth/oauth oauth2: resource: token-info-uri: ${security.auth.server}/check_token diff --git a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml index c20521c58..800555b71 100644 --- a/pigx-config/src/main/resources/config/pigx-daemon-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-daemon-dev.yml @@ -24,7 +24,7 @@ spring: simples: spring-simple-job: job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob - cron: 0/2 * * * * ? + cron: 0 0 0/3 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 eventTraceRdbDataSource: 'dataSource' @@ -32,7 +32,7 @@ spring: listener-class: com.pig4cloud.pigx.daemon.listener.PigxElasticJobListener spring-simple-job2: job-class: com.pig4cloud.pigx.daemon.job.PigxSimpleJob2 - cron: 0/2 * * * * ? + cron: 0 0 0/2 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 eventTraceRdbDataSource: 'dataSource' @@ -42,7 +42,7 @@ spring: dataflows: spring-dataflow-job: job-class: com.pig4cloud.pigx.daemon.job.PigxDataflowJob - cron: 0/2 * * * * ? + cron: 0 0 0/1 * * ? sharding-total-count: 3 sharding-item-parameters: 0=service1,1=service2,2=service3 streaming-process: true diff --git a/pigx-eureka/Dockerfile b/pigx-eureka/Dockerfile index e05fb249b..3e0e339d6 100644 --- a/pigx-eureka/Dockerfile +++ b/pigx-eureka/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-eureka EXPOSE 1025 -ADD ./pigx-eureka/target/pigx-eureka.jar ./ +ADD ./target/pigx-eureka.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-eureka.jar diff --git a/pigx-eureka/pom.xml b/pigx-eureka/pom.xml index aa03ba98c..11e030668 100644 --- a/pigx-eureka/pom.xml +++ b/pigx-eureka/pom.xml @@ -79,6 +79,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-eureka/src/main/resources/bootstrap.yml b/pigx-eureka/src/main/resources/bootstrap.yml index b5d334125..e933fbe80 100644 --- a/pigx-eureka/src/main/resources/bootstrap.yml +++ b/pigx-eureka/src/main/resources/bootstrap.yml @@ -13,7 +13,7 @@ spring: # 类似的 redis 使用pigx-redis ,gateway 换成 pigx-gateway eureka: instance: - hostname: localhost + hostname: pigx-eureka prefer-ip-address: true client: register-with-eureka: true diff --git a/pigx-gateway/Dockerfile b/pigx-gateway/Dockerfile index 3d765f3ac..b61d5b6d0 100644 --- a/pigx-gateway/Dockerfile +++ b/pigx-gateway/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-gateway EXPOSE 9999 -ADD ./pigx-gateway/target/pigx-gateway.jar ./ +ADD ./target/pigx-gateway.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-gateway.jar diff --git a/pigx-gateway/pom.xml b/pigx-gateway/pom.xml index bec78b588..b712150c6 100644 --- a/pigx-gateway/pom.xml +++ b/pigx-gateway/pom.xml @@ -82,6 +82,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-gateway/src/main/resources/bootstrap.yml b/pigx-gateway/src/main/resources/bootstrap.yml index aeb0ffd87..5916dfdb8 100644 --- a/pigx-gateway/src/main/resources/bootstrap.yml +++ b/pigx-gateway/src/main/resources/bootstrap.yml @@ -22,6 +22,6 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-upms/pigx-upms-biz/Dockerfile b/pigx-upms/pigx-upms-biz/Dockerfile index 7709e058f..e1734d555 100644 --- a/pigx-upms/pigx-upms-biz/Dockerfile +++ b/pigx-upms/pigx-upms-biz/Dockerfile @@ -6,8 +6,8 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-upms WORKDIR /pigx/bin/com.pig4cloud/pigx-upms -EXPOSE 1025 +EXPOSE 4000 -ADD ./pigx-upms/pigx-upms-biz/target/pigx-upms-biz.jar ./ +ADD ./target/pigx-upms-biz.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-upms-biz.jar diff --git a/pigx-upms/pigx-upms-biz/pom.xml b/pigx-upms/pigx-upms-biz/pom.xml index 5c9727afc..3916c99d9 100644 --- a/pigx-upms/pigx-upms-biz/pom.xml +++ b/pigx-upms/pigx-upms-biz/pom.xml @@ -113,6 +113,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml index 1dbe02882..ba90e1d06 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/bootstrap.yml @@ -23,4 +23,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-visual/pigx-codegen/Dockerfile b/pigx-visual/pigx-codegen/Dockerfile index 0df7a6417..cb136f278 100644 --- a/pigx-visual/pigx-codegen/Dockerfile +++ b/pigx-visual/pigx-codegen/Dockerfile @@ -6,8 +6,8 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-codegen WORKDIR /pigx/bin/com.pig4cloud/pigx-codegen -EXPOSE 5001 +EXPOSE 5003 -ADD ./pigx-visual/pigx-codegen/target/pigx-codegen.jar ./ +ADD ./target/pigx-codegen.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-codegen.jar diff --git a/pigx-visual/pigx-codegen/pom.xml b/pigx-visual/pigx-codegen/pom.xml index 17e5dd70f..2a9843844 100755 --- a/pigx-visual/pigx-codegen/pom.xml +++ b/pigx-visual/pigx-codegen/pom.xml @@ -77,6 +77,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml index 359f44828..dcef36826 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-codegen/src/main/resources/bootstrap.yml @@ -20,7 +20,7 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ logging: level: root: debug diff --git a/pigx-visual/pigx-daemon/Dockerfile b/pigx-visual/pigx-daemon/Dockerfile index a442fde69..bcfddd240 100644 --- a/pigx-visual/pigx-daemon/Dockerfile +++ b/pigx-visual/pigx-daemon/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-daemon EXPOSE 5002 -ADD ./pigx-visual/pigx-daemon/target/pigx-daemon.jar ./ +ADD ./target/pigx-daemon.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-daemon.jar diff --git a/pigx-visual/pigx-daemon/pom.xml b/pigx-visual/pigx-daemon/pom.xml index 8102b16f0..73e3baac7 100644 --- a/pigx-visual/pigx-daemon/pom.xml +++ b/pigx-visual/pigx-daemon/pom.xml @@ -99,6 +99,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml index da9accb63..88c5cbaf0 100644 --- a/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-daemon/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pigx-visual/pigx-monitor/Dockerfile b/pigx-visual/pigx-monitor/Dockerfile index 09feb12a2..534fa4fd9 100644 --- a/pigx-visual/pigx-monitor/Dockerfile +++ b/pigx-visual/pigx-monitor/Dockerfile @@ -8,6 +8,6 @@ WORKDIR /pigx/bin/com.pig4cloud/pigx-monitor EXPOSE 5001 -ADD ./pigx-visual/pigx-monitor/target/pigx-monitor.jar ./ +ADD ./target/pigx-monitor.jar ./ CMD java -Djava.security.egd=file:/dev/./urandom -jar pigx-monitor.jar diff --git a/pigx-visual/pigx-monitor/pom.xml b/pigx-visual/pigx-monitor/pom.xml index cb69eb933..d23c6154e 100644 --- a/pigx-visual/pigx-monitor/pom.xml +++ b/pigx-visual/pigx-monitor/pom.xml @@ -79,6 +79,25 @@ ${project.name} + + com.spotify + docker-maven-plugin + 0.4.12 + + ${registry.url}/${project.name}:0.0.1 + ${docker.url} + ${project.basedir} + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + docker-hub + https://index.docker.io/v1/ + + diff --git a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml index 1e29612c9..fc2891602 100644 --- a/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-monitor/src/main/resources/bootstrap.yml @@ -20,4 +20,4 @@ eureka: prefer-ip-address: true client: service-url: - defaultZone: http://pig:pig@localhost:1025/eureka/ + defaultZone: http://pig:pig@pigx-eureka:1025/eureka/ diff --git a/pom.xml b/pom.xml index 79d7ca212..3d132f08d 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,8 @@ 1.7 2.1.5 2.3.3.RELEASE + http://192.168.0.13:4243 + 192.168.0.13:5000