From c736610c0d0627589a138cd289ce4746f4fac139 Mon Sep 17 00:00:00 2001
From: judith <8w8u8@naver.com>
Date: Mon, 11 Nov 2024 12:11:49 +0900
Subject: [PATCH] fix: Update github-action.yml

---
 .github/workflows/github-action.yml | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml
index e2d60c52..86809194 100644
--- a/.github/workflows/github-action.yml
+++ b/.github/workflows/github-action.yml
@@ -17,17 +17,13 @@ jobs:
           java-version: 21
           distribution: 'zulu'
 
-      - name: Make application.yml
+      - name: Make application.yml and GCP Key
         run: |
           mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성
           cd ./bookduck/src/main/resources
           touch ./application.yml
           echo "${{ secrets.APPLICATION }}" > ./application.yml
-
-      - name: Copy GCP Service Account Key to Docker Container
-        run: |
-          container_id=$(docker ps -q -f "name=my_container_name")
-          docker cp ./src/main/resources/mmc-bookduck-ocr.json $container_id:/home/ubuntu/bookduck/src/main/resources/mmc-bookduck-ocr.json
+          echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | openssl base64 -d -A > mmc-bookduck-ocr.json
 
       - name: Gradle Caching
         uses: actions/cache@v3
@@ -71,5 +67,13 @@ jobs:
             sudo docker-compose -f /home/ubuntu/docker-compose.yml down # 이전 컨테이너들 제거
             sudo docker pull ${{ secrets.DOCKER_REPO }}:latest # 최신 Docker 이미지 가져오기
             sudo docker-compose -f /home/ubuntu/docker-compose.yml up -d # docker-compose로 컨테이너 실행
+            sleep 10
+            container_id=$(sudo docker ps -q -f "ancestor=${{ secrets.DOCKER_REPO }}:latest") # 애플리케이션 컨테이너 ID 가져오기
+            if [ -n "$container_id" ]; then
+              sudo docker cp /home/ubuntu/bookduck/src/main/resources/mmc-bookduck-ocr.json $container_id:/home/ubuntu/bookduck/src/main/resources/ # 파일 복사
+            else
+              echo "Application container not found"
+              exit 1
+            fi
             sudo docker image prune -f # 불필요한 이미지를 정리