chore: ci-cd docker-compose tag 수정

MARU-EGG · Sep 9, 2024 · 6a69c70 · 6a69c70
1 parent b21b9ac
commit 6a69c70
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml
@@ -29,7 +29,6 @@ jobs:
           cd ./src/main/resources
           touch ./application.yml
           echo "${{ secrets.YML }}" > ./application.yml
-        shell: bash
 
       # 환경별 yml 파일 생성 - dev
       - name: make application-dev.yml
@@ -38,7 +37,6 @@ jobs:
           cd ./src/main/resources
           touch ./application-dev.yml
           echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
-        shell: bash
 
       # Gradle 패키지 캐시
       - name: Cache Gradle packages
@@ -85,24 +83,30 @@ jobs:
 
   deploy:
     runs-on: ubuntu-latest
+
     needs: integration
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3
 
+      - name: Set environment variables for Docker Compose
+        run: |
+          echo "DOCKER_REPO=${{ secrets.DOCKER_REPO }}" >> $GITHUB_ENV
+          echo "GITHUB_RUN_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
+
+      - name: Verify environment variables
+        run: |
+          echo "DOCKER_REPO=${{ secrets.DOCKER_REPO }}"
+          echo "GITHUB_RUN_NUMBER=${{ github.run_number }}"
+
       - name: Check docker-compose.yml file
         run: |
           if [ ! -f docker/docker-compose.yml ]; then
             echo "Error: docker/docker-compose.yml not found."
             exit 1
           fi
 
-      - name: Set environment variables for Docker Compose
-        run: |
-          echo "DOCKER_REPO=${{ secrets.DOCKER_REPO }}" >> $GITHUB_ENV
-          echo "GITHUB_RUN_NUMBER=${{ github.run_number }}" >> $GITHUB_ENV
-
       - name: Copy docker-compose into instance
         uses: appleboy/scp-action@master
         with:
@@ -124,10 +128,14 @@ jobs:
           key: ${{ secrets.PEM_KEY }}
           script: |
             cd /home/${{ secrets.USERNAME }}
-            envsubst < <(echo "${{ secrets.DOCKER_COMPOSE_DEV }}") > docker-compose-dev.yml
+            export DOCKER_REPO=${{ secrets.DOCKER_REPO }}
+            export GITHUB_RUN_NUMBER=${{ github.run_number }}
+            echo "DOCKER_REPO=${DOCKER_REPO}"
+            echo "GITHUB_RUN_NUMBER=${GITHUB_RUN_NUMBER}"
+            envsubst < docker-compose.yml > docker-compose-dev.yml
             echo ${{ secrets.DOCKER_PASSWORD }} | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
             if [ "$(sudo docker ps -q)" ]; then sudo docker stop $(sudo docker ps -q); fi
             if [ "$(sudo docker ps -a -q)" ]; then sudo docker rm $(sudo docker ps -a -q); fi
-            sudo docker pull ${{ secrets.DOCKER_REPO }}:develop
+            sudo docker pull ${{ secrets.DOCKER_REPO }}:develop-${{ github.run_number }}
             sudo docker-compose -f docker-compose-dev.yml up -d
-            sudo docker image prune -f
+            sudo docker image prune -f
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   maru-egg-app:
     container_name: maru-egg
-    image: ${DOCKER_REPO}:develop
+    image: ${DOCKER_REPO}:develop-${GITHUB_RUN_NUMBER}
     ports:
       - "8080:8080"
     networks: