From 748c552d4750905cb8d0e533e03fc582d9ab570b Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Sun, 10 Nov 2024 23:23:32 +0900 Subject: [PATCH 01/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index 1657fe8d..a998d205 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -24,6 +24,12 @@ jobs: touch ./application.yml echo "${{ secrets.APPLICATION }}" > ./application.yml + - name: Make GCP Service Account Key + run: | + cd ./bookduck/src/main/resources + echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | base64 --decode > mmc-bookduck-ocr.json + shell: bash + - name: Gradle Caching uses: actions/cache@v3 with: From 82bcfd5abbbe61d151627eab014cb6118ec58a54 Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 00:39:44 +0900 Subject: [PATCH 02/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index a998d205..e1536e9f 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -29,6 +29,9 @@ jobs: cd ./bookduck/src/main/resources echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | base64 --decode > mmc-bookduck-ocr.json shell: bash + + - name: Verify JSON File Location + run: ls -l ./bookduck/src/main/resources - name: Gradle Caching uses: actions/cache@v3 From 87b32b7b20e021ced0328f581f5180399c700951 Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 00:50:56 +0900 Subject: [PATCH 03/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index e1536e9f..38e6bef2 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -31,7 +31,9 @@ jobs: shell: bash - name: Verify JSON File Location - run: ls -l ./bookduck/src/main/resources + run: | + ls -l ./bookduck/src/main/resources + cat ./bookduck/src/main/resources/mmc - name: Gradle Caching uses: actions/cache@v3 From 8bd29569e3b438c2c65ce01c1429e306540bf8a2 Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 00:52:16 +0900 Subject: [PATCH 04/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index 38e6bef2..63c06d38 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -33,7 +33,7 @@ jobs: - name: Verify JSON File Location run: | ls -l ./bookduck/src/main/resources - cat ./bookduck/src/main/resources/mmc + cat './bookduck/src/main/resources/mmc-bookduck-ocr.json' - name: Gradle Caching uses: actions/cache@v3 From c4c6ed82864f18271e08d23d42ef029dc426f44c Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 11:02:21 +0900 Subject: [PATCH 05/10] =?UTF-8?q?fix:=20Update=20github-action.yml=20-=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-action.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index 63c06d38..4b962ab5 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -26,14 +26,10 @@ jobs: - name: Make GCP Service Account Key run: | - cd ./bookduck/src/main/resources + mkdir -p /home/ubuntu/bookduck/src/main/resources + cd /home/ubuntu/bookduck/src/main/resources echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | base64 --decode > mmc-bookduck-ocr.json shell: bash - - - name: Verify JSON File Location - run: | - ls -l ./bookduck/src/main/resources - cat './bookduck/src/main/resources/mmc-bookduck-ocr.json' - name: Gradle Caching uses: actions/cache@v3 From 2663a5fafd3bcf7b9cdd08ebe78b493904ee96be Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 11:04:26 +0900 Subject: [PATCH 06/10] =?UTF-8?q?fix:=20Update=20github-action.yml=20-=20?= =?UTF-8?q?=EA=B6=8C=ED=95=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/github-action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index 4b962ab5..d6223b4a 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -19,7 +19,7 @@ jobs: - name: Make application.yml run: | - mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성 + sudo mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성 cd ./bookduck/src/main/resources touch ./application.yml echo "${{ secrets.APPLICATION }}" > ./application.yml From 4c6b325f80e6de299c089fabf77138f90704502c Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 11:07:44 +0900 Subject: [PATCH 07/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index d6223b4a..ee462fbf 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -19,17 +19,16 @@ jobs: - name: Make application.yml run: | - sudo mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성 + mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성 cd ./bookduck/src/main/resources touch ./application.yml echo "${{ secrets.APPLICATION }}" > ./application.yml - name: Make GCP Service Account Key run: | - mkdir -p /home/ubuntu/bookduck/src/main/resources - cd /home/ubuntu/bookduck/src/main/resources - echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | base64 --decode > mmc-bookduck-ocr.json - shell: bash + sudo mkdir -p ./bookduck/src/main/resources + sudo touch ./bookduck/src/main/resources/application.yml + echo "${{ secrets.APPLICATION }}" | sudo tee ./bookduck/src/main/resources/application.yml - name: Gradle Caching uses: actions/cache@v3 From 84b6da509e8f808caf3f2f0d68502d85eed1ac3c Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 11:58:10 +0900 Subject: [PATCH 08/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index ee462fbf..e2d60c52 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -24,11 +24,10 @@ jobs: touch ./application.yml echo "${{ secrets.APPLICATION }}" > ./application.yml - - name: Make GCP Service Account Key + - name: Copy GCP Service Account Key to Docker Container run: | - sudo mkdir -p ./bookduck/src/main/resources - sudo touch ./bookduck/src/main/resources/application.yml - echo "${{ secrets.APPLICATION }}" | sudo tee ./bookduck/src/main/resources/application.yml + 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 - name: Gradle Caching uses: actions/cache@v3 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 09/10] 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 # 불필요한 이미지를 정리 From e647e1ad39f20812f45393662cf065f854671bfb Mon Sep 17 00:00:00 2001 From: judith <8w8u8@naver.com> Date: Mon, 11 Nov 2024 12:40:24 +0900 Subject: [PATCH 10/10] fix: Update github-action.yml --- .github/workflows/github-action.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.github/workflows/github-action.yml b/.github/workflows/github-action.yml index 86809194..288242d2 100644 --- a/.github/workflows/github-action.yml +++ b/.github/workflows/github-action.yml @@ -17,13 +17,12 @@ jobs: java-version: 21 distribution: 'zulu' - - name: Make application.yml and GCP Key + - name: Make application.yml run: | mkdir -p ./bookduck/src/main/resources # 디렉토리가 없으면 생성 cd ./bookduck/src/main/resources touch ./application.yml echo "${{ secrets.APPLICATION }}" > ./application.yml - echo "${{ secrets.GCP_ACCESS_KEY_BASE64 }}" | openssl base64 -d -A > mmc-bookduck-ocr.json - name: Gradle Caching uses: actions/cache@v3 @@ -67,13 +66,4 @@ 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 # 불필요한 이미지를 정리 -