Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/CD-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,4 @@ jobs:
./gradlew clean build
docker rm -f moplus-server-dev --force
docker rmi moplus-server-dev
docker-compose -f docker-compose-dev.yml -p moplus-dev up --build -d
docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d
2 changes: 1 addition & 1 deletion .github/workflows/CD-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,5 @@ jobs:
./gradlew clean build
docker rm -f moplus-server-prod --force
docker rmi moplus-server-prod
docker-compose -f docker-compose-prod.yml -p moplus-prod up --build -d
docker-compose -f docker-compose-prod.yml -p pointer-prod up --build -d

14 changes: 7 additions & 7 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ services:
build:
context: .
dockerfile: Dockerfile
container_name: moplus-server-dev
image: moplus-server-dev
container_name: pointer-server-dev
image: pointer-server-dev
restart: always
ports:
- 8081:8080
environment:
- TZ=Asia/Seoul
- SPRING_PROFILES_ACTIVE=dev
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
- SPRING_DATASOURCE_USERNAME=${DEV_MYSQL_USER}
- SPRING_DATASOURCE_PASSWORD=${DEV_MYSQL_PASSWORD}
- SENTRY_DSN=${SENTRY_DSN}
Expand All @@ -31,12 +31,12 @@ services:
depends_on:
- mysql
networks:
- moplus-dev
- pointer-dev
- nginx-network

mysql:
image: mysql:8.0
container_name: moplus-mysql-dev
container_name: pointer-mysql-dev
environment:
MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: ${DEV_MYSQL_DATABASE}
Expand All @@ -47,7 +47,7 @@ services:
volumes:
- dev_data:/var/lib/mysql
networks:
- moplus-dev
- pointer-dev
volumes:
dev_data:
driver: local
Expand All @@ -57,7 +57,7 @@ volumes:
device: ../mopl_data/dev_data

networks:
moplus-dev:
pointer-dev:
driver: bridge
nginx-network:
external: true
23 changes: 14 additions & 9 deletions docker-compose-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ services:
build:
context: .
dockerfile: Dockerfile.prod
container_name: moplus-server-prod
image: moplus-server-prod
container_name: pointer-server-prod
image: pointer-server-prod
restart: always
ports:
- 8080:8080
environment:
- TZ=Asia/Seoul
- SPRING_PROFILES_ACTIVE=prod
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
- SPRING_DATASOURCE_USERNAME=${PROD_MYSQL_USER}
- SPRING_DATASOURCE_PASSWORD=${PROD_MYSQL_PASSWORD}
- SENTRY_DSN=${SENTRY_DSN}
Expand All @@ -30,12 +30,12 @@ services:
depends_on:
- mysql
networks:
- moplus-prod
- pointer-prod
- nginx-network

mysql:
image: mysql:8.0
container_name: moplus-mysql-prod
container_name: pointer-mysql-prod
environment:
MYSQL_ROOT_PASSWORD: ${PROD_MYSQL_ROOT_PASSWORD}
MYSQL_DATABASE: ${PROD_MYSQL_DATABASE}
Expand All @@ -44,14 +44,19 @@ services:
ports:
- "3306:3306"
volumes:
- moplus_prod_data:/var/lib/mysql
- pointer_prod_data:/var/lib/mysql
networks:
- moplus-prod
- pointer-prod
volumes:
moplus_prod_data:
pointer_prod_data:
driver: local
driver_opts:
type: none
o: bind
device: ../mopl_data/dev_data

networks:
moplus-prod:
pointer-prod:
driver: bridge
nginx-network:
external: true