diff --git a/epmet-admin/epmet-admin-server/Dockerfile b/epmet-admin/epmet-admin-server/Dockerfile index 38da8a0872..c0b3c72e27 100644 --- a/epmet-admin/epmet-admin-server/Dockerfile +++ b/epmet-admin/epmet-admin-server/Dockerfile @@ -8,4 +8,4 @@ COPY ./target/*.jar ./app.jar EXPOSE 8082 -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-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml similarity index 62% rename from epmet-admin/epmet-admin-server/docker-compose.yml rename to epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml index b77b2d2e39..f3aa22d8d1 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/deploy/docker-compose-dev.yml @@ -2,12 +2,14 @@ version: "3.7" services: epmet-admin-server: container_name: epmet-admin-server-dev - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-dev/epmet-admin-server:0.3.3 + image: 192.168.1.130:10080/epmet-cloud-dev/epmet-admin-server:0.3.4 ports: - "8082:8082" 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-admin/epmet-admin-server/pom.xml b/epmet-admin/epmet-admin-server/pom.xml index cf9ae81208..4fc616058f 100644 --- a/epmet-admin/epmet-admin-server/pom.xml +++ b/epmet-admin/epmet-admin-server/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - 0.3.3 + 0.3.4 com.epmet epmet-admin @@ -123,19 +123,19 @@ - + - epmet - elink@833066 + epmet_admin_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