fix(deploy): attach infra services to shared mci-network and fix mci-server Dockerfile
- Add mci-network to infrastructure services so app services can resolve mci-mysql - Remove cross-project depends_on from docker-compose.app.yml - Copy parent pom.xml in mci-server Dockerfile so child modules resolve sino-mci-parent - Fix typo in local-up.sh RabbitMQ retry counter
This commit is contained in:
@@ -1,12 +1,14 @@
|
|||||||
FROM maven:3.9-eclipse-temurin-21-alpine AS builder
|
FROM maven:3.9-eclipse-temurin-21-alpine AS builder
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
COPY pom.xml ./pom.xml
|
||||||
COPY mci-shared ./mci-shared
|
COPY mci-shared ./mci-shared
|
||||||
COPY mci-channel-common ./mci-channel-common
|
COPY mci-channel-common ./mci-channel-common
|
||||||
COPY mci-server/pom.xml ./mci-server/pom.xml
|
COPY mci-server/pom.xml ./mci-server/pom.xml
|
||||||
COPY mci-server/src ./mci-server/src
|
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-channel-common/pom.xml install -DskipTests && \
|
||||||
mvn -f mci-server/pom.xml package -DskipTests
|
mvn -f mci-server/pom.xml package -DskipTests
|
||||||
|
|
||||||
|
|||||||
@@ -15,10 +15,6 @@ services:
|
|||||||
- SPRING_DATASOURCE_PASSWORD=root
|
- SPRING_DATASOURCE_PASSWORD=root
|
||||||
- SPRING_DATA_REDIS_HOST=mci-redis
|
- SPRING_DATA_REDIS_HOST=mci-redis
|
||||||
- SPRING_RABBITMQ_HOST=mci-rabbitmq
|
- SPRING_RABBITMQ_HOST=mci-rabbitmq
|
||||||
depends_on:
|
|
||||||
- mci-mysql
|
|
||||||
- mci-redis
|
|
||||||
- mci-rabbitmq
|
|
||||||
networks:
|
networks:
|
||||||
- mci-network
|
- mci-network
|
||||||
|
|
||||||
@@ -29,8 +25,6 @@ services:
|
|||||||
container_name: mci-admin-web
|
container_name: mci-admin-web
|
||||||
ports:
|
ports:
|
||||||
- "80:80"
|
- "80:80"
|
||||||
depends_on:
|
|
||||||
- mci-server
|
|
||||||
networks:
|
networks:
|
||||||
- mci-network
|
- mci-network
|
||||||
|
|
||||||
@@ -43,8 +37,6 @@ services:
|
|||||||
- "8000:8000"
|
- "8000:8000"
|
||||||
environment:
|
environment:
|
||||||
- MCI_SERVER_URL=http://mci-server:8080/msg-platform
|
- MCI_SERVER_URL=http://mci-server:8080/msg-platform
|
||||||
depends_on:
|
|
||||||
- mci-server
|
|
||||||
networks:
|
networks:
|
||||||
- mci-network
|
- mci-network
|
||||||
|
|
||||||
|
|||||||
@@ -11,12 +11,16 @@ services:
|
|||||||
- "3306:3306"
|
- "3306:3306"
|
||||||
volumes:
|
volumes:
|
||||||
- mci-mysql-data:/var/lib/mysql
|
- mci-mysql-data:/var/lib/mysql
|
||||||
|
networks:
|
||||||
|
- mci-network
|
||||||
|
|
||||||
redis:
|
redis:
|
||||||
image: redis:7.2
|
image: redis:7.2
|
||||||
container_name: mci-redis
|
container_name: mci-redis
|
||||||
ports:
|
ports:
|
||||||
- "6379:6379"
|
- "6379:6379"
|
||||||
|
networks:
|
||||||
|
- mci-network
|
||||||
|
|
||||||
rabbitmq:
|
rabbitmq:
|
||||||
image: rabbitmq:3.13-management
|
image: rabbitmq:3.13-management
|
||||||
@@ -27,6 +31,8 @@ services:
|
|||||||
ports:
|
ports:
|
||||||
- "5672:5672"
|
- "5672:5672"
|
||||||
- "15672:15672"
|
- "15672:15672"
|
||||||
|
networks:
|
||||||
|
- mci-network
|
||||||
|
|
||||||
seaweedfs:
|
seaweedfs:
|
||||||
image: chrislusf/seaweedfs:3.62
|
image: chrislusf/seaweedfs:3.62
|
||||||
@@ -37,7 +43,13 @@ services:
|
|||||||
command: server -dir=/data
|
command: server -dir=/data
|
||||||
volumes:
|
volumes:
|
||||||
- mci-seaweedfs-data:/data
|
- mci-seaweedfs-data:/data
|
||||||
|
networks:
|
||||||
|
- mci-network
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
mci-mysql-data:
|
mci-mysql-data:
|
||||||
mci-seaweedfs-data:
|
mci-seaweedfs-data:
|
||||||
|
|
||||||
|
networks:
|
||||||
|
mci-network:
|
||||||
|
external: true
|
||||||
|
|||||||
Reference in New Issue
Block a user