[FIX] cicd submodule 해결

Author: hyunbin1

.github/workflows/cicd.yml

@@ -1,6 +1,5 @@
-name: CI/CD using github actions & docker
+name: CI/CD using GitHub Actions & Docker
 
-# event trigger
 on:
   push:
     branches:
@@ -11,19 +10,22 @@ permissions:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
+
     steps:
-      # open jdk 17 버전 환경을 세팅
-      - uses: actions/checkout@v3
+      - name: Checkout repository with submodules
+        uses: actions/checkout@v4
+        with:
+          token: ${{ secrets.CONFIG_TOKEN }}
+          submodules: true
+
       - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
           java-version: "17"
           distribution: "temurin"
 
-      # gradle caching - 빌드 시간 향상
-      - name: Gradle Caching
+      - name: Gradle caching
         uses: actions/cache@v3
         with:
           path: |
@@ -33,85 +35,41 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
-      #Set up Gradle
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
-      # Github Submodule에서 환경변수 가져오기
-      - name: Checkout repo
-        uses: actions/checkout@v4
-        with:
-          token: ${{secrets.CONFIG_TOKEN}}
-          submodules: true
-
-      # 서브모듈 업데이트 (초기화)
-      - name: Update Git Submodules
-        run: |
-          git submodule update --init --recursive
-          ls -al Server-v2.0-Config/yml 
-
-      # Gradle 빌드 전에, application.yml 존재 여부 확인
-      - name: Check application.yml exists
-        run: |
-          if [ -f "Server-v2.0-Config/yml/application.yml" ]; then
-            echo "application.yml exists"
-          else
-            echo "application.yml NOT FOUND"
-            exit 1
-          fi
-
-      # 프로젝트 메타정보 추출해서 Docker image에 태그 생성
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{secrets.DOCKER_USERNAME}}/daily-pay
-          # 가장 최신 image 에 latest tag 달기
-          flavor: |
-            latest=true
-          # Git short commit, use git version tag
-          tags: |
-            type=semver,pattern={{version}}
-
-      # gradle build
       - name: Build with Gradle
         run: |
           chmod +x ./gradlew
           ./gradlew clean build -x test
 
-      # DockerHub 로그인
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          username: ${{secrets.DOCKER_USERNAME}}
-          password: ${{secrets.DOCKER_PASSWORD}}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
 
-      # Docker image Build해서 DockerHub에 Push
       - name: Docker build and push
         run: |
           docker build -t ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }} .
           docker push ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}
 
-      # EC2 서버에 배포
-      - name: Deploy to prod
+      - name: Deploy to EC2
         uses: appleboy/ssh-action@master
-        id: deploy-prod
         with:
-          host: ${{ secrets.SSH_KNOWN_HOSTS }}
+          host: ${{ secrets.SSH_HOST }}
           username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.SSH_PEM_KEY }}
+          key: ${{ secrets.SSH_PRIVATE_KEY }}
           script: |
-            echo "Stopping and removing existing Docker containers..."
-            sudo docker stop $(sudo docker ps -aq) || echo "No running containers"
-            sudo docker rm -f $(sudo docker ps -aq) || echo "No containers to remove"
+            echo "Stopping existing container..."
+            sudo docker stop ai-tutor-app || echo "No running container to stop"
+            sudo docker rm ai-tutor-app || echo "No container to remove"
 
-            echo "Pulling the latest Docker image..."
+            echo "Pulling latest Docker image..."
             sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}:latest
 
             echo "Starting new Docker container..."
             sudo docker run -d -p 80:8080 --restart always --name ai-tutor-app ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_REPO }}:latest
 
             echo "Cleaning up unused Docker images..."
             sudo docker image prune -f || echo "No images to prune"
-
-

build.gradle

@@ -15,6 +15,19 @@ jar {
     enabled = false
 }
 
+sourceSets {
+    main {
+        resources {
+            srcDir 'Server-v2.0-Config/yml'
+            include 'application.yml'
+        }
+    }
+}
+
+tasks.named('processResources') {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+}
+
 configurations {
     compileOnly {
         extendsFrom annotationProcessor