暂存提交

deploy/docker-compose.yml

@@ -2,7 +2,7 @@ name: firstleg-${DEPLOY_ENV:-test}
 
 x-common: &common
   restart: unless-stopped
-  networks: [firstleg-network]
+  networks: [firstleg-network, infra-network]
   environment: &common-environment
     SPRING_PROFILES_ACTIVE: ${SPRING_PROFILES_ACTIVE:-cn}
     NACOS_SERVER_ADDR: ${NACOS_SERVER_ADDR}
@@ -30,7 +30,7 @@ services:
   gateway:
     <<: *common
     image: ${IMAGE_REPOSITORY}/gateway:${IMAGE_TAG}
-    container_name: firstleg-gateway
+    container_name: firstleg-${DEPLOY_ENV:-test}-gateway
     ports: ["${GATEWAY_PORT:-9000}:9000"]
     environment:
       <<: *common-environment
@@ -42,7 +42,7 @@ services:
   auth:
     <<: *common
     image: ${IMAGE_REPOSITORY}/auth:${IMAGE_TAG}
-    container_name: firstleg-auth
+    container_name: firstleg-${DEPLOY_ENV:-test}-auth
     ports: ["${AUTH_PORT:-9100}:9100"]
     environment:
       <<: *common-environment
@@ -54,7 +54,7 @@ services:
   iam:
     <<: *common
     image: ${IMAGE_REPOSITORY}/iam:${IMAGE_TAG}
-    container_name: firstleg-iam
+    container_name: firstleg-${DEPLOY_ENV:-test}-iam
     ports: ["${IAM_PORT:-9201}:9201"]
     environment:
       <<: *common-environment
@@ -66,7 +66,7 @@ services:
   firstleg:
     <<: *common
     image: ${IMAGE_REPOSITORY}/firstleg:${IMAGE_TAG}
-    container_name: firstleg-business
+    container_name: firstleg-${DEPLOY_ENV:-test}-business
     ports: ["${FIRSTLEG_PORT:-9202}:9202"]
     environment:
       <<: *common-environment
@@ -78,7 +78,7 @@ services:
   order:
     <<: *common
     image: ${IMAGE_REPOSITORY}/order:${IMAGE_TAG}
-    container_name: firstleg-order
+    container_name: firstleg-${DEPLOY_ENV:-test}-order
     ports: ["${ORDER_PORT:-9204}:9204"]
     environment:
       <<: *common-environment
@@ -90,7 +90,7 @@ services:
   warehouse:
     <<: *common
     image: ${IMAGE_REPOSITORY}/warehouse:${IMAGE_TAG}
-    container_name: firstleg-warehouse
+    container_name: firstleg-${DEPLOY_ENV:-test}-warehouse
     ports: ["${WAREHOUSE_PORT:-9205}:9205"]
     environment:
       <<: *common-environment
@@ -102,7 +102,7 @@ services:
   file:
     <<: *common
     image: ${IMAGE_REPOSITORY}/file:${IMAGE_TAG}
-    container_name: firstleg-file
+    container_name: firstleg-${DEPLOY_ENV:-test}-file
     ports: ["${FILE_PORT:-9206}:9206"]
     volumes: ["firstleg-file-data:/data/files"]
     environment:
@@ -116,7 +116,7 @@ services:
   print:
     <<: *common
     image: ${IMAGE_REPOSITORY}/print:${IMAGE_TAG}
-    container_name: firstleg-print
+    container_name: firstleg-${DEPLOY_ENV:-test}-print
     ports: ["${PRINT_PORT:-9207}:9207"]
     environment:
       <<: *common-environment
@@ -128,7 +128,7 @@ services:
   integration-service:
     <<: *common
     image: ${IMAGE_REPOSITORY}/integration-service:${IMAGE_TAG}
-    container_name: firstleg-integration
+    container_name: firstleg-${DEPLOY_ENV:-test}-integration
     ports: ["${INTEGRATION_PORT:-9210}:9210"]
     environment:
       <<: *common-environment
@@ -147,7 +147,7 @@ services:
   event-bridge-service:
     <<: *common
     image: ${IMAGE_REPOSITORY}/event-bridge-service:${IMAGE_TAG}
-    container_name: firstleg-event-bridge
+    container_name: firstleg-${DEPLOY_ENV:-test}-event-bridge
     ports: ["${EVENT_BRIDGE_PORT:-9300}:9300"]
     environment:
       <<: *common-environment
@@ -159,7 +159,7 @@ services:
   audit-service:
     <<: *common
     image: ${IMAGE_REPOSITORY}/audit-service:${IMAGE_TAG}
-    container_name: firstleg-audit
+    container_name: firstleg-${DEPLOY_ENV:-test}-audit
     ports: ["${AUDIT_PORT:-9700}:9700"]
     environment:
       <<: *common-environment
@@ -171,6 +171,9 @@ services:
 networks:
   firstleg-network:
     name: firstleg-${DEPLOY_ENV:-test}-network
+  infra-network:
+    external: true
+    name: ${INFRA_NETWORK:-firstleg-test-infra-network}
 
 volumes:
   firstleg-file-data:

deploy/scripts/deploy-services.sh

@@ -18,10 +18,6 @@ if [ ! -f "$ENV_FILE" ]; then
 fi
 
 SERVICES=$(printf '%s' "$SERVICE_CSV" | tr ',' ' ')
-case " $SERVICES " in
-  *" gateway "*) SERVICES="$SERVICES" ;;
-  *) SERVICES="$SERVICES gateway" ;;
-esac
 
 export DEPLOY_ENV IMAGE_REPOSITORY IMAGE_TAG
 docker compose \