Merge pull request #136 from team-ppointer/develop

서버 마이그레이션

Author: sejoon00

.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
+            cd ~/pointer_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
@@ -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

.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)
+            cd ~/pointer_server
+            kill -9 $(lsof -t -i :8080)
             git checkout master
             git add .
             git commit -m "temp commit"
@@ -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
 

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}
@@ -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

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}
@@ -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