diff --git a/backend/mci-server/Dockerfile b/backend/mci-server/Dockerfile index a218d87..0a303df 100644 --- a/backend/mci-server/Dockerfile +++ b/backend/mci-server/Dockerfile @@ -1,12 +1,14 @@ FROM maven:3.9-eclipse-temurin-21-alpine AS builder WORKDIR /app +COPY pom.xml ./pom.xml COPY mci-shared ./mci-shared COPY mci-channel-common ./mci-channel-common COPY mci-server/pom.xml ./mci-server/pom.xml COPY mci-server/src ./mci-server/src -RUN mvn -f mci-shared/pom.xml install -DskipTests && \ +RUN mvn -N install && \ + mvn -f mci-shared/pom.xml install -DskipTests && \ mvn -f mci-channel-common/pom.xml install -DskipTests && \ mvn -f mci-server/pom.xml package -DskipTests diff --git a/docker-compose.app.yml b/docker-compose.app.yml index cc80db3..32347ac 100644 --- a/docker-compose.app.yml +++ b/docker-compose.app.yml @@ -15,10 +15,6 @@ services: - SPRING_DATASOURCE_PASSWORD=root - SPRING_DATA_REDIS_HOST=mci-redis - SPRING_RABBITMQ_HOST=mci-rabbitmq - depends_on: - - mci-mysql - - mci-redis - - mci-rabbitmq networks: - mci-network @@ -29,8 +25,6 @@ services: container_name: mci-admin-web ports: - "80:80" - depends_on: - - mci-server networks: - mci-network @@ -43,8 +37,6 @@ services: - "8000:8000" environment: - MCI_SERVER_URL=http://mci-server:8080/msg-platform - depends_on: - - mci-server networks: - mci-network diff --git a/infrastructure/docker-compose.yml b/infrastructure/docker-compose.yml index e1bba16..20077f7 100644 --- a/infrastructure/docker-compose.yml +++ b/infrastructure/docker-compose.yml @@ -11,12 +11,16 @@ services: - "3306:3306" volumes: - mci-mysql-data:/var/lib/mysql + networks: + - mci-network redis: image: redis:7.2 container_name: mci-redis ports: - "6379:6379" + networks: + - mci-network rabbitmq: image: rabbitmq:3.13-management @@ -27,6 +31,8 @@ services: ports: - "5672:5672" - "15672:15672" + networks: + - mci-network seaweedfs: image: chrislusf/seaweedfs:3.62 @@ -37,7 +43,13 @@ services: command: server -dir=/data volumes: - mci-seaweedfs-data:/data + networks: + - mci-network volumes: mci-mysql-data: mci-seaweedfs-data: + +networks: + mci-network: + external: true