diff --git a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile index 321b1bffb1..98190f2cd2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/Dockerfile +++ b/epmet-module/resi-partymember/resi-partymember-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8096 -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-module/resi-partymember/resi-partymember-server/docker-compose.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml rename to epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml index 1761a56387..ac470e82e1 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/docker-compose.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/resi-partymember-server:0.3.17 + image: 192.168.1.130:10080/epmet-cloud-dev/resi-partymember-server:0.3.18 ports: - "8096:8096" 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-module/resi-partymember/resi-partymember-server/pom.xml b/epmet-module/resi-partymember/resi-partymember-server/pom.xml index 88d6a9cee4..e8caee77f0 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/pom.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.17 + 0.3.18 com.epmet resi-partymember @@ -121,9 +121,9 @@ dev-local - + 8096 dev @@ -151,28 +151,28 @@ dev - + 8096 dev - + - epmet - elink@833066 + epmet_resi_partymember_user + EpmEt-db-UsEr 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 @@ -190,19 +190,19 @@ - + epmet elink@833066 0 - 10.10.10.248 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com 6379 - 123456 + EpmEtrEdIs!q@w true - 122.152.200.70:8848 - fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae false diff --git a/epmet-user/epmet-user-server/Dockerfile b/epmet-user/epmet-user-server/Dockerfile index e55cc4a531..2495f36a46 100644 --- a/epmet-user/epmet-user-server/Dockerfile +++ b/epmet-user/epmet-user-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8087 -ENTRYPOINT ["java","-Xms32m","-Xmx250m","-jar","./app.jar"] \ No newline at end of file +ENTRYPOINT ["sh", "-c", "$RUN_INSTRUCT"] \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml similarity index 60% rename from epmet-user/epmet-user-server/docker-compose.yml rename to epmet-user/epmet-user-server/deploy/docker-compose-dev.yml index 0bb7fd6a21..4b8a67a4b0 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/epmet-user/epmet-user-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: epmet-user-server: container_name: epmet-user-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-user-server:0.3.25 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-user-server:0.3.26 ports: - "8087:8087" network_mode: host # 不会创建新的网络 - volumes: + volumes:` - "/opt/epmet-cloud-logs/dev:/logs" + environment: + RUN_INSTRUCT: "java -Xms32m -Xmx200m -jar ./app.jar" deploy: resources: limits: diff --git a/epmet-user/epmet-user-server/pom.xml b/epmet-user/epmet-user-server/pom.xml index b4cfaa0275..c044f5d727 100644 --- a/epmet-user/epmet-user-server/pom.xml +++ b/epmet-user/epmet-user-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.25 + 0.3.26 com.epmet epmet-user @@ -106,9 +106,9 @@ dev-local - + 8087 dev @@ -136,28 +136,28 @@ dev - + 8087 dev - + - epmet - elink@833066 + epmet_user_user + EpmEt-db-UsEr 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 @@ -175,19 +175,19 @@ - + epmet elink@833066 0 - 10.10.10.248 + r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com 6379 - 123456 + EpmEtrEdIs!q@w true - 122.152.200.70:8848 - fcd6fc8f-ca3a-4b01-8026-2b05cdc5976b + 192.168.10.150:8848 + 67e3c350-533e-4d7c-9f8f-faf1b4aa82ae false