diff --git a/epmet-auth/Dockerfile b/epmet-auth/Dockerfile index ab95a2ca96..c106eaf299 100644 --- a/epmet-auth/Dockerfile +++ b/epmet-auth/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8081 -ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-auth/docker-compose.yml b/epmet-auth/deploy/docker-compose-dev.yml similarity index 63% rename from epmet-auth/docker-compose.yml rename to epmet-auth/deploy/docker-compose-dev.yml index 4efc5abb82..47bdcb1a5f 100644 --- a/epmet-auth/docker-compose.yml +++ b/epmet-auth/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-auth:0.3.5 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-auth:0.3.6 ports: - "8081:8081" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" deploy: resources: limits: diff --git a/epmet-auth/pom.xml b/epmet-auth/pom.xml index 1c532a59da..7f654c6876 100644 --- a/epmet-auth/pom.xml +++ b/epmet-auth/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.5 + 0.3.6 com.epmet epmet-cloud @@ -172,13 +172,13 @@ 0 - r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 192.168.1.130 6379 - EpmEtrEdIs!q@w + 123456 true - 192.168.10.150:8848 - 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b false diff --git a/epmet-gateway/Dockerfile b/epmet-gateway/Dockerfile index f14c4a8d68..a237b2929f 100644 --- a/epmet-gateway/Dockerfile +++ b/epmet-gateway/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8080 -ENTRYPOINT ["java","-Xms32m","-Xmx200m","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/deploy/docker-compose-dev.yml similarity index 63% rename from epmet-gateway/docker-compose.yml rename to epmet-gateway/deploy/docker-compose-dev.yml index 330e7dfed7..2a0aabf6ac 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: epmet-gateway-server: container_name: epmet-gateway-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-gateway:0.3.5 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-gateway:0.3.6 ports: - "8080:8080" network_mode: host # 使用现有网络 volumes: - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" deploy: resources: limits: diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index e3c45756f4..a8bca75aee 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.5 + 0.3.6 com.epmet epmet-cloud @@ -186,17 +186,17 @@ 0 - r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com + 192.168.1.130 6379 - EpmEtrEdIs!q@w + 123456 true - 192.168.10.150:8848 - 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae + 122.152.200.70:8848 + fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b false - + lb://epmet-auth-server