[chore] develop 브랜치에 push할시 dev 환경 배포

Author: sejoon00

.github/workflows/CD-dev.yml

@@ -0,0 +1,36 @@
+name: moplus-server
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Deploy spring MainServer(develop)
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.SERVER_HOST }}
+          username: ${{ secrets.SERVER_USERNAME }}
+          key: ${{ secrets.SERVER_KEY }}
+          script: |
+            cd ~/moplus_server
+            kill -9 $(lsof -t -i :8081)
+            git add ../
+            git commit -m "temp commit"
+            git fetch origin develop
+            git merge origin/develop
+            if [ $? -ne 0 ]; then
+              echo "Merge conflict detected. Resolving by applying remote changes."
+              git checkout --theirs $(git diff --name-only --diff-filter=U)
+              git add .
+              git commit -m "Resolved merge conflicts by applying remote changes."
+            else
+              echo "Merge successful, no conflicts detected."
+            fi
+            
+            ./gradlew clean build
+            docker rm -f moplus-server-dev --force
+            docker rmi moplus_server_back
+            docker-compose -f docker-compose-dev.yml up --build -d

docker-compose-dev.yml

@@ -14,7 +14,7 @@ services:
     depends_on:
       - mysql
     networks:
-      - moplus
+      - moplus-dev
       - nginx-network
 
   mysql:
@@ -27,12 +27,13 @@ services:
     volumes:
       - mysql_data:/var/lib/mysql
     networks:
-      - moplus
+      - moplus-dev
 volumes:
   mysql_data:
 
 networks:
   moplus:
+    name: moplus-dev
     driver: bridge
   nginx-network:
     external: true