From 88870ec73dccfec365bad49c6cc56f95000578a3 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: Sun, 4 May 2025 22:48:36 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[feat]=20=EC=84=9C=EB=B2=84=20aws=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CD-dev.yml | 8 ++++---- .github/workflows/CD-prod.yml | 8 ++++---- docker-compose-dev.yml | 2 +- docker-compose-prod.yml | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index dc7ed10e..bba2cb07 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -11,13 +11,13 @@ jobs: - name: Deploy spring MainServer(develop) uses: appleboy/ssh-action@master with: - host: ${{ secrets.SERVER_HOST }} - username: ${{ secrets.SERVER_USERNAME }} - key: ${{ secrets.SERVER_KEY }} + host: ${{ secrets.SERVER_HOST_DEV }} + username: ${{ secrets.SERVER_USERNAME_DEV }} + key: ${{ secrets.SERVER_KEY_DEV }} script: | cd ~/moplus_server git checkout develop - kill -9 $(lsof -t -i :8081) + kill -9 $(lsof -t -i :8080) git add ../ git commit -m "temp commit" git fetch origin develop diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml index 6e16c69c..b8d8e0aa 100644 --- a/.github/workflows/CD-prod.yml +++ b/.github/workflows/CD-prod.yml @@ -10,12 +10,12 @@ jobs: - name: Deploy spring MainServer(main) uses: appleboy/ssh-action@master with: - host: ${{ secrets.SERVER_HOST }} - username: ${{ secrets.SERVER_USERNAME }} - key: ${{ secrets.SERVER_KEY }} + host: ${{ secrets.SERVER_HOST_PROD }} + username: ${{ secrets.SERVER_USERNAME_PROD }} + key: ${{ secrets.SERVER_KEY_PROD}} script: | cd ~/moplus_server - kill -9 $(lsof -t -i :8081) + kill -9 $(lsof -t -i :8080) git checkout master git add . git commit -m "temp commit" diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 23ec8a5a..4a2e045b 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -11,7 +11,7 @@ services: environment: - TZ=Asia/Seoul - SPRING_PROFILES_ACTIVE=dev - - 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_URL=jdbc:mysql://${DEV_MYSQL_HOST}: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} diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index 6c03ee07..acb9ef87 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -11,7 +11,7 @@ services: environment: - TZ=Asia/Seoul - SPRING_PROFILES_ACTIVE=prod - - 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_URL=jdbc:mysql://${PROD_MYSQL_HOST}: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} From ae5d911450eb54e7f5138208a7d39e0542ce1c1e 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: Sun, 4 May 2025 23:00:35 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[feat]=20=EC=84=9C=EB=B2=84=20aws=20?= =?UTF-8?q?=EB=A7=88=EC=9D=B4=EA=B7=B8=EB=A0=88=EC=9D=B4=EC=85=98?= 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 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index bba2cb07..cd9fbec9 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -15,7 +15,7 @@ jobs: username: ${{ secrets.SERVER_USERNAME_DEV }} key: ${{ secrets.SERVER_KEY_DEV }} script: | - cd ~/moplus_server + cd ~/pointer_server git checkout develop kill -9 $(lsof -t -i :8080) git add ../ diff --git a/.github/workflows/CD-prod.yml b/.github/workflows/CD-prod.yml index b8d8e0aa..aefb9d6d 100644 --- a/.github/workflows/CD-prod.yml +++ b/.github/workflows/CD-prod.yml @@ -14,7 +14,7 @@ jobs: username: ${{ secrets.SERVER_USERNAME_PROD }} key: ${{ secrets.SERVER_KEY_PROD}} script: | - cd ~/moplus_server + cd ~/pointer_server kill -9 $(lsof -t -i :8080) git checkout master git add . From 590d086547d13940bc61c8ee079de73f5a5c2a12 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: Mon, 5 May 2025 12:57:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[fix]=20docker=20compose=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= 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 | 25 ------------------------- docker-compose-prod.yml | 22 ---------------------- 4 files changed, 2 insertions(+), 49 deletions(-) diff --git a/.github/workflows/CD-dev.yml b/.github/workflows/CD-dev.yml index cd9fbec9..39d0c3a3 100644 --- a/.github/workflows/CD-dev.yml +++ b/.github/workflows/CD-dev.yml @@ -34,4 +34,4 @@ jobs: ./gradlew clean build docker rm -f pointer-server-dev --force docker rmi pointer-server-dev - docker-compose -f docker-compose-dev.yml -p pointer-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 aefb9d6d..f10a82d8 100644 --- a/.github/workflows/CD-prod.yml +++ b/.github/workflows/CD-prod.yml @@ -33,5 +33,5 @@ jobs: ./gradlew clean build docker rm -f pointer-server-prod --force docker rmi pointer-server-prod - docker-compose -f docker-compose-prod.yml -p pointer-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 4a2e045b..68ec5e87 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -30,35 +30,10 @@ services: - KAKAO_LOGIN_CLIENT_ID=${KAKAO_LOGIN_CLIENT_ID} - KAKAO_LOGIN_CLIENT_SECRET=${KAKAO_LOGIN_CLIENT_SECRET} - KAKAO_LOGIN_REDIRECT_URI=${KAKAO_LOGIN_DEV_REDIRECT_URI} - - depends_on: - - mysql networks: - pointer-dev - nginx-network - mysql: - image: mysql:8.0 - container_name: pointer-mysql-dev - environment: - MYSQL_ROOT_PASSWORD: ${DEV_MYSQL_ROOT_PASSWORD} - MYSQL_DATABASE: ${DEV_MYSQL_DATABASE} - MYSQL_USER: ${DEV_MYSQL_USER} - MYSQL_PASSWORD: ${DEV_MYSQL_PASSWORD} - ports: - - "3307:3306" - volumes: - - dev_data:/var/lib/mysql - networks: - - pointer-dev -volumes: - dev_data: - driver: local - driver_opts: - o: bind - type: none - device: ../mopl_data/dev_data - networks: pointer-dev: driver: bridge diff --git a/docker-compose-prod.yml b/docker-compose-prod.yml index acb9ef87..d6893935 100644 --- a/docker-compose-prod.yml +++ b/docker-compose-prod.yml @@ -36,28 +36,6 @@ services: - pointer-prod - nginx-network - mysql: - image: mysql:8.0 - container_name: pointer-mysql-prod - environment: - MYSQL_ROOT_PASSWORD: ${PROD_MYSQL_ROOT_PASSWORD} - MYSQL_DATABASE: ${PROD_MYSQL_DATABASE} - MYSQL_USER: ${PROD_MYSQL_USER} - MYSQL_PASSWORD: ${PROD_MYSQL_PASSWORD} - ports: - - "3306:3306" - volumes: - - pointer_prod_data:/var/lib/mysql - networks: - - pointer-prod -volumes: - pointer_prod_data: - driver: local - driver_opts: - type: none - o: bind - device: ../mopl_data/pointer_prod_data - networks: pointer-prod: driver: bridge