脚本优化

docker-compose.yaml

@@ -61,15 +61,17 @@ services:
       - "${PORT:-8118}:8081"
       - "${PORT_CRM:-8181}:8181"
     restart: on-failure
-  java-notice:
+  java-build-image:
     build:
-      context: src
+      context: ./src
       dockerfile: Dockerfile-java
     image: galaxy-java:11
+  java-notice:
+    image: galaxy-java:11
     container_name: java-notice-${ENV:-dev}
     environment:
       - PROJECT_NAME=notice
-    command: ['java','-jar','/app/app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80']
+    command: ['java','-jar','app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80']
     volumes:
       - ${CODE_DIR}:/app/code
       - maven-repo:/usr/share/maven/repo # maven共享repo目录
@@ -79,8 +81,6 @@ services:
       - galaxy-net
     restart: on-failure
   java-biz-platform:
-    depends_on:
-      - java-notice
     image: galaxy-java:11
     container_name: java-biz-platform-${ENV:-dev}
     volumes:
@@ -88,15 +88,13 @@ services:
       - maven-repo:/usr/share/maven/repo # maven共享repo目录
     environment:
       - PROJECT_NAME=biz-platform
-    command: ['java','-jar','/app/app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80']
+    command: ['java','-jar','app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80']
     expose:
       - 80
     networks:
       - galaxy-net
     restart: on-failure
   java-flowengine:
-    depends_on:
-      - java-notice
     image: galaxy-java:11
     container_name: java-flowengine-${ENV:-dev}
     volumes:
@@ -104,15 +102,13 @@ services:
       - maven-repo:/usr/share/maven/repo # maven共享repo目录
     environment:
       - PROJECT_NAME=flowengine
-    command: [ 'java','-jar','/app/app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
+    command: [ 'java','-jar','app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
     expose:
       - 80
     networks:
       - galaxy-net
     restart: on-failure
   java-intelligentwriting:
-    depends_on:
-      - java-notice
     image: galaxy-java:11
     container_name: java-intelligentwriting-${ENV:-dev}
     volumes:
@@ -120,15 +116,13 @@ services:
       - maven-repo:/usr/share/maven/repo # maven共享repo目录
     environment:
       - PROJECT_NAME=intelligentwriting
-    command: [ 'java','-jar','/app/app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
+    command: [ 'java','-jar','app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
     expose:
       - 80
     networks:
       - galaxy-net
     restart: on-failure
   java-client:
-    depends_on:
-      - java-notice
     image: galaxy-java:11
     container_name: java-client-${ENV:-dev}
     volumes:
@@ -136,7 +130,7 @@ services:
       - maven-repo:/usr/share/maven/repo # maven共享repo目录
     environment:
       - PROJECT_NAME=client
-    command: ['java','-jar','/app/app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
+    command: ['java','-jar','app.jar','--spring.profiles.active=${JAVA_PROFILE:-innerdev}','--server.port=80' ]
     expose:
       - 80
     networks:
@@ -146,6 +140,10 @@ networks:
   galaxy-net:
     name: galaxy-net
     driver: bridge
+    ipam:
+      config:
+        - subnet: 10.19.32.0/23
+
 volumes:
   maven-repo:
     name: maven-repo
\ No newline at end of file