#139 [CI/CD] 배포 / 개발 서버 분리 작업

Author: si-zero

.github/workflows/deploy-dev.yml

@@ -0,0 +1,55 @@
+name: Java CI/CD with Gradle (Dev Server)
+
+on:
+  push:
+    branches: [ "dev" ] # 1. 데브 브랜치 전용
+  workflow_dispatch:
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: '21'
+          distribution: 'temurin'
+          cache: 'gradle'
+
+      - name: Build with Gradle
+        run: |
+          chmod +x ./gradlew
+          ./gradlew build -x test
+
+      - name: Create .env file from Secret
+        run: |
+          cat <<'EOF' > .env
+          ${{ secrets.ENV_VARIABLES }}
+          EOF
+
+      - name: Copy JAR and .env to EC2
+        uses: appleboy/scp-action@v0.1.7
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          source: "build/libs/*-SNAPSHOT.jar, .env"
+          target: "~/dev-server" # 2. 데브 전용 폴더
+          strip_components: 2
+
+      - name: Deploy to EC2
+        uses: appleboy/ssh-action@v1.0.3
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USERNAME }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            # 3. 8081 포트만 종료 (8080은 건드리지 않음)
+            fuser -k 8081/tcp || true 
+            
+            cd ~/dev-server
+            chmod +x *.jar
+            # 4. 8081 포트로 실행
+            nohup java -jar -Dserver.port=8081 *-SNAPSHOT.jar > dev-app.log 2>&1 &

.github/workflows/deploy.yml .github/workflows/deploy-main.yml.github/workflows/deploy.yml renamed to .github/workflows/deploy-main.yml

@@ -1,9 +1,9 @@
-name: Java CI/CD with Gradle
+name: Java CI/CD with Gradle (Main Server)
 
 on:
   push:
-    branches: [ "dev" ] # dev 브랜치에 푸시할 때 작동
-  workflow_dispatch: #
+    branches: [ "main" ] # 1. 메인 브랜치 전용
+  workflow_dispatch:
 
 jobs:
   deploy:
@@ -16,7 +16,7 @@ jobs:
         with:
           java-version: '21'
           distribution: 'temurin'
-          cache: 'gradle' # 캐싱 추가: 빌드 속도가 훨씬 빨라집니다.
+          cache: 'gradle'
 
       - name: Build with Gradle
         run: |
@@ -35,9 +35,8 @@ jobs:
           host: ${{ secrets.EC2_HOST }}
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
-          # -plain.jar는 배포에 필요 없으므로 제외합니다.
           source: "build/libs/*-SNAPSHOT.jar, .env"
-          target: "~/"
+          target: "~/main-server" # 2. 메인 전용 폴더
           strip_components: 2
 
       - name: Deploy to EC2
@@ -47,7 +46,10 @@ jobs:
           username: ${{ secrets.EC2_USERNAME }}
           key: ${{ secrets.EC2_SSH_KEY }}
           script: |
+            # 3. 8080 포트만 종료
             fuser -k 8080/tcp || true 
             
-            chmod +x ~/start.sh
-            ~/start.sh
+            cd ~/main-server
+            chmod +x *.jar
+            # 4. 8080 포트 명시적 실행
+            nohup java -jar -Dserver.port=8080 *-SNAPSHOT.jar > main-app.log 2>&1 &

src/main/java/com/swyp/picke/global/config/SwaggerConfig.java

@@ -15,15 +15,25 @@ public class SwaggerConfig {
 
     @Bean
     public OpenAPI openAPI() {
-        // 1. 운영 서버 주소 명시
-        Server prodServer = new Server();
-        prodServer.setUrl("https://picke.store");
-        prodServer.setDescription("Production Server");
+        // 1. 운영 서버 (8080)
+        Server prodServer = new Server()
+                .url("https://picke.store")
+                .description("Production Server");
 
-        // 2. 로컬 테스트용 서버 주소
-        Server localServer = new Server();
-        localServer.setUrl("http://localhost:8080");
-        localServer.setDescription("Local Development Server");
+        // 2. 로컬 개발 서버 (8080)
+        Server local8080 = new Server()
+                .url("http://localhost:8080")
+                .description("Local Development Server (8080)");
+
+        // 3. 로컬 개발 서버 (8081)
+        Server local8081 = new Server()
+                .url("http://localhost:8081")
+                .description("Local Development Server (8081)");
+
+        // 4. 실제 EC2 데브 서버 (8081) - 나중에 배포 후 확인용
+        Server devServer = new Server()
+                .url("http://picke.store:8081")
+                .description("Remote Dev Server (8081)");
 
         SecurityScheme securityScheme = new SecurityScheme()
                 .type(SecurityScheme.Type.HTTP)
@@ -37,7 +47,7 @@ public OpenAPI openAPI() {
 
         return new OpenAPI()
                 // 3. 서버 리스트 등록
-                .servers(List.of(prodServer, localServer))
+                .servers(List.of(prodServer, local8080, local8081, devServer))
                 .info(new Info()
                               .title("PIQUE API 명세서")
                               .description("PIQUE 서비스 API 명세서입니다.")