Skip to content

Commit 4ae19fd

Browse files
authored
Merge pull request #85 from team-MoPlus/develop
[fix] 도메인 변경으로인한 docker-compose 설정 변경
2 parents bfb76f4 + b10131b commit 4ae19fd

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

.github/workflows/CD-dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ jobs:
3434
./gradlew clean build
3535
docker rm -f moplus-server-dev --force
3636
docker rmi moplus-server-dev
37-
docker-compose -f docker-compose-dev.yml -p moplus-dev up --build -d
37+
docker-compose -f docker-compose-dev.yml -p pointer-dev up --build -d

.github/workflows/CD-prod.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ jobs:
3333
./gradlew clean build
3434
docker rm -f moplus-server-prod --force
3535
docker rmi moplus-server-prod
36-
docker-compose -f docker-compose-prod.yml -p moplus-prod up --build -d
36+
docker-compose -f docker-compose-prod.yml -p pointer-prod up --build -d
3737

docker-compose-dev.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile
6-
container_name: moplus-server-dev
7-
image: moplus-server-dev
6+
container_name: pointer-server-dev
7+
image: pointer-server-dev
88
restart: always
99
ports:
1010
- 8081:8080
1111
environment:
1212
- TZ=Asia/Seoul
1313
- SPRING_PROFILES_ACTIVE=dev
14-
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
14+
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-dev:3306/${DEV_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
1515
- SPRING_DATASOURCE_USERNAME=${DEV_MYSQL_USER}
1616
- SPRING_DATASOURCE_PASSWORD=${DEV_MYSQL_PASSWORD}
1717
- SENTRY_DSN=${SENTRY_DSN}
@@ -31,12 +31,12 @@ services:
3131
depends_on:
3232
- mysql
3333
networks:
34-
- moplus-dev
34+
- pointer-dev
3535
- nginx-network
3636

3737
mysql:
3838
image: mysql:8.0
39-
container_name: moplus-mysql-dev
39+
container_name: pointer-mysql-dev
4040
environment:
4141
MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_ROOT_PASSWORD}
4242
MYSQL_DATABASE: ${DEV_MYSQL_DATABASE}
@@ -47,7 +47,7 @@ services:
4747
volumes:
4848
- dev_data:/var/lib/mysql
4949
networks:
50-
- moplus-dev
50+
- pointer-dev
5151
volumes:
5252
dev_data:
5353
driver: local
@@ -57,7 +57,7 @@ volumes:
5757
device: ../mopl_data/dev_data
5858

5959
networks:
60-
moplus-dev:
60+
pointer-dev:
6161
driver: bridge
6262
nginx-network:
6363
external: true

docker-compose-prod.yml

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ services:
33
build:
44
context: .
55
dockerfile: Dockerfile.prod
6-
container_name: moplus-server-prod
7-
image: moplus-server-prod
6+
container_name: pointer-server-prod
7+
image: pointer-server-prod
88
restart: always
99
ports:
1010
- 8080:8080
1111
environment:
1212
- TZ=Asia/Seoul
1313
- SPRING_PROFILES_ACTIVE=prod
14-
- SPRING_DATASOURCE_URL=jdbc:mysql://moplus-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
14+
- SPRING_DATASOURCE_URL=jdbc:mysql://pointer-mysql-prod:3306/${PROD_MYSQL_DATABASE}?useSSL=false&characterEncoding=UTF-8&serverTimezone=Asia/Seoul&allowPublicKeyRetrieval=true&tinyInt1isBit=false
1515
- SPRING_DATASOURCE_USERNAME=${PROD_MYSQL_USER}
1616
- SPRING_DATASOURCE_PASSWORD=${PROD_MYSQL_PASSWORD}
1717
- SENTRY_DSN=${SENTRY_DSN}
@@ -30,12 +30,12 @@ services:
3030
depends_on:
3131
- mysql
3232
networks:
33-
- moplus-prod
33+
- pointer-prod
3434
- nginx-network
3535

3636
mysql:
3737
image: mysql:8.0
38-
container_name: moplus-mysql-prod
38+
container_name: pointer-mysql-prod
3939
environment:
4040
MYSQL_ROOT_PASSWORD: ${PROD_MYSQL_ROOT_PASSWORD}
4141
MYSQL_DATABASE: ${PROD_MYSQL_DATABASE}
@@ -44,14 +44,19 @@ services:
4444
ports:
4545
- "3306:3306"
4646
volumes:
47-
- moplus_prod_data:/var/lib/mysql
47+
- pointer_prod_data:/var/lib/mysql
4848
networks:
49-
- moplus-prod
49+
- pointer-prod
5050
volumes:
51-
moplus_prod_data:
51+
pointer_prod_data:
52+
driver: local
53+
driver_opts:
54+
type: none
55+
o: bind
56+
device: ../mopl_data/dev_data
5257

5358
networks:
54-
moplus-prod:
59+
pointer-prod:
5560
driver: bridge
5661
nginx-network:
5762
external: true

0 commit comments

Comments
 (0)