diff --git a/epmet-module/gov-mine/gov-mine-server/Dockerfile b/epmet-module/gov-mine/gov-mine-server/Dockerfile index 0bdb6f026f..583d3041e9 100644 --- a/epmet-module/gov-mine/gov-mine-server/Dockerfile +++ b/epmet-module/gov-mine/gov-mine-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8098 -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/gov-mine/gov-mine-server/docker-compose.yml b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-module/gov-mine/gov-mine-server/docker-compose.yml rename to epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml index 27c711fc44..3910b88cf5 100644 --- a/epmet-module/gov-mine/gov-mine-server/docker-compose.yml +++ b/epmet-module/gov-mine/gov-mine-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: gov-mine-server: container_name: gov-mine-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-mine-server:0.3.8 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-mine-server:0.3.9 ports: - "8098:8098" 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/gov-mine/gov-mine-server/pom.xml b/epmet-module/gov-mine/gov-mine-server/pom.xml index 465e254034..c9d57e8d2e 100644 --- a/epmet-module/gov-mine/gov-mine-server/pom.xml +++ b/epmet-module/gov-mine/gov-mine-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.8 + 0.3.9 com.epmet gov-mine @@ -146,13 +146,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 @@ -170,13 +170,13 @@ 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-module/gov-org/gov-org-server/Dockerfile b/epmet-module/gov-org/gov-org-server/Dockerfile index 15c4d6ed03..b079f1ff77 100644 --- a/epmet-module/gov-org/gov-org-server/Dockerfile +++ b/epmet-module/gov-org/gov-org-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8092 -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-module/gov-org/gov-org-server/docker-compose.yml b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-module/gov-org/gov-org-server/docker-compose.yml rename to epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml index 7414547eb5..b225461720 100644 --- a/epmet-module/gov-org/gov-org-server/docker-compose.yml +++ b/epmet-module/gov-org/gov-org-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: gov-org-server: container_name: gov-org-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/gov-org-server:0.3.31 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-org-server:0.3.32 ports: - "8092:8092" 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/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index 068c61a78d..618b29f97d 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.31 + 0.3.32 com.epmet gov-org @@ -153,19 +153,19 @@ - + - epmet - elink@833066 + epmet_gov_org_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 @@ -183,19 +183,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