Merge pull request #101 from GTable/feature/#58-docker-setting

refactor: docker compose 파일 환경별로 분리

Author: Jjiggu

.github/ISSUE_TEMPLATE/needdelete.md

@@ -0,0 +1,14 @@
+---
+name: 백엔드 이슈
+about: 백엔드와 관련된 이슈
+title: "[백엔드] "
+labels: Backend
+assignees: ''
+
+---
+
+# 이슈 내용
+
+
+# 작업 목록
+- [ ]

.github/ISSUE_TEMPLATE/백엔드-이슈.md

@@ -70,14 +70,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Copy docker-compose.yml to EC2
+      - name: Copy docker-compose.admin.yml to EC2
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USER }}
           key: ${{ secrets.EC2_SSH_KEY }}
           port: ${{ secrets.EC2_PORT }}
-          source: "docker-compose.yml"
+          source: "docker-compose.admin.yml"
           target: ${{ env.EC2_DEPLOY_PATH }}
 
       - name: Copy deploy-admin-docker.sh to EC2

.github/workflows/deploy-admin-docker.yml

@@ -3,7 +3,7 @@ name: Dev Admin CI/CD
 on:
   push:
     branches:
-      - develop
+      - legacy
     paths:
     - 'nowait-app-admin-api/**'
     - 'nowait-common/**'

.github/workflows/deploy-admin.yml

@@ -67,14 +67,14 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - name: Copy docker-compose.yml to EC2
+      - name: Copy docker-compose.user.yml to EC2
         uses: appleboy/scp-action@master
         with:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USER }}
           key: ${{ secrets.EC2_SSH_KEY }}
           port: ${{ secrets.EC2_PORT }}
-          source: "docker-compose.yml"
+          source: "docker-compose.user.yml"
           target: ${{ env.EC2_DEPLOY_PATH }}
 
       - name: Copy deploy-user-docker to EC2

.github/workflows/deploy-user-docker.yml

@@ -3,7 +3,7 @@ name: Dev User CI/CD
 on:
   push:
     branches:
-    - develop
+    - legacy
     paths:
     - 'nowait-app-user-api/**'
     - 'nowait-common/**'

.github/workflows/deploy-user.yml

@@ -10,3 +10,4 @@ public static void main(String[] args) {
 		org.springframework.boot.SpringApplication.run(ApiAdminApplication.class, args);
 	}
 }
+

docker-compose.yml

@@ -11,3 +11,4 @@ public static void main(String[] args) {
 		SpringApplication.run(ApiUserApplication.class, args);
 	}
 }
+

nowait-app-admin-api/src/main/java/com/nowait/ApiAdminApplication.java

@@ -17,8 +17,8 @@ else
 fi
 
 echo "3. start container"
-sudo docker-compose -p nowait_dev pull nowait-app-admin-api
-sudo docker-compose -p nowait_dev up -d nowait-app-admin-api
+sudo docker-compose -f docker-compose.admin.yml -p nowait_dev pull nowait-app-admin-api
+sudo docker-compose -f docker-compose.admin.yml -p nowait_dev up -d nowait-app-admin-api
 
 echo "4. check container status"
 NEW_CONTAINER_ID=$(docker ps -q --filter "name=nowait-app-admin-api")