.

Author: mjKim1229

.github/workflows/ci-cd.yml

@@ -2,7 +2,7 @@ name: CI-CD
 
 on:
   push:
-    branches: [ "main", "dev"]
+    branches: [ "main", "dev" ]
 
 jobs:
   CI-CD:
@@ -25,6 +25,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-gradle-
 
+      # === application.yml 설정 ===
       - name: make application.yml
         if: contains(github.ref, 'main') || contains(github.ref, 'dev')
         run: |
@@ -34,13 +35,14 @@ jobs:
         shell: bash
 
       - name: make application.yml (Internal)
-        if: contains(github.ref, 'main') || contains(github.ref, 'dev')
+        if: contains(github.ref, 'dev')
         run: |
           cd ./Clubber-Internal/src/main/resources 
           touch ./application.yml 
           echo "${{ secrets.INTERNAL_YML }}" > ./application.yml
         shell: bash
 
+      # === dev 환경 ===
       - name: make application-dev.yml
         if: contains(github.ref, 'dev')
         run: |
@@ -49,7 +51,6 @@ jobs:
           echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
         shell: bash
 
-      # [Internal] application-dev.yml
       - name: make application-dev.yml (Internal)
         if: contains(github.ref, 'dev')
         run: |
@@ -58,6 +59,7 @@ jobs:
           echo "${{ secrets.INTERNAL_YML_DEV }}" > ./application-dev.yml
         shell: bash
 
+      # === prod 환경 ===
       - name: make application-prod.yml
         if: contains(github.ref, 'main')
         run: |
@@ -66,25 +68,20 @@ jobs:
           echo "${{ secrets.YML_PROD }}" > ./application-prod.yml
         shell: bash
 
-#      # [Internal] application-prod.yml
-#      - name: make application-prod.yml (Internal)
-#        if: contains(github.ref, 'main')
-#        run: |
-#          cd ./Clubber-Internal/src/main/resources
-#          touch ./application-prod.yml
-#          echo "${{ secrets.YML_PROD }}" > ./application-prod.yml
-#        shell: bash
+      # Internal prod 완전 제외됨
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
+      # === Build ===
       - name: Build with Gradle
         run: ./gradlew :Clubber-External:clean build -x test
 
-      # [Internal] Build
       - name: Build with Gradle (Internal)
+        if: contains(github.ref, 'dev')
         run: ./gradlew :Clubber-Internal:clean build -x test
 
+      # === Docker Build & Push (dev) ===
       - name: docker build and push to dev
         if: contains(github.ref, 'dev')
         run: |
@@ -101,7 +98,6 @@ jobs:
           docker build -f Dockerfile.nginx.dev -t ${{ secrets.DOCKER_REPO }}/clubber-nginx-dev .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-nginx-dev
 
-      # [Internal] Docker Build & Push (Dev)
       - name: docker build and push to dev (Internal)
         if: contains(github.ref, 'dev')
         run: |
@@ -110,6 +106,7 @@ jobs:
           docker build -f Dockerfile.dev -t ${{ secrets.DOCKER_REPO }}/clubber-internal-dev .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-internal-dev
 
+      # === Docker Build & Push (prod) ===
       - name: docker build and push to prod
         if: contains(github.ref, 'main')
         run: |
@@ -126,15 +123,7 @@ jobs:
           docker build -f Dockerfile.nginx.prod -t ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
 
-#      # [Internal] Docker Build & Push (Prod)
-#      - name: docker build and push to prod (Internal)
-#        if: contains(github.ref, 'main')
-#        run: |
-#          cd Clubber-Internal
-#          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
-#          docker build -f Dockerfile.prod -t ${{ secrets.DOCKER_REPO }}/clubber-internal-prod .
-#          docker push ${{ secrets.DOCKER_REPO }}/clubber-internal-prod
-
+      # === 배포 ===
       - name: Copy docker-compose.yml to EC2 DEV
         if: contains(github.ref, 'dev')
         uses: appleboy/scp-action@master
@@ -183,8 +172,7 @@ jobs:
             cd /home/ubuntu
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-backend-prod
-#            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-internal-prod  # [Internal]
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-prod
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
             sudo docker-compose -f docker-compose-prod.yml up -d
-            sudo docker image prune -f
+            sudo docker image prune -f