From b10131bddcbfc21914b657a27dc7bfdd347055c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EB=B0=95=EC=84=B8=EC=A4=80?= <74056843+sejoon00@users.noreply.github.com> Date: Thu, 6 Mar 2025 15:49:01 +0900 Subject: [PATCH] =?UTF-8?q?[fix]=20=EB=8F=84=EB=A9=94=EC=9D=B8=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9C=BC=EB=A1=9C=EC=9D=B8=ED=95=9C=20docker-compose?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-dev.yml | 2 +- .github/workflows/CD-prod.yml | 2 +- docker-compose-dev.yml | 14 +++++++------- docker-compose-prod.yml | 23 ++++++++++++++--------- 4 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index a75e459..46e603e 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -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 diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml index fbda3e9..4e26607 100644 --- a/.github/workflows/CD-prod.yml +++ b/.github/workflows/CD-prod.yml @@ -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 diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 37eb094..ed48a4d 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -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} @@ -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} @@ -47,7 +47,7 @@ services: volumes: - dev_data:/var/lib/mysql networks: - - moplus-dev + - pointer-dev volumes: dev_data: driver: local @@ -57,7 +57,7 @@ volumes: device: ../mopl_data/dev_data networks: - moplus-dev: + pointer-dev: driver: bridge nginx-network: external: true \ No newline at end of file diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index d69e30d..d02a6ff 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -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} @@ -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} @@ -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 \ No newline at end of file