From 92b6ab31fd63b3bbda5d2f8b45f9bf46483244f5 Mon Sep 17 00:00:00 2001 From: Vincentius7 <124507621+Vincentius7@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:51:38 +0900 Subject: [PATCH 1/3] =?UTF-8?q?deploy=20=EC=88=98=EC=A0=95=EB=B3=B8=20?= =?UTF-8?q?=EB=B3=B5=EC=9B=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 49d56cc..6d12583 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -9,6 +9,9 @@ on: - "backend/Dockerfile" branches: - dev + - main + workflow_dispatch: + jobs: makeTagAndRelease: runs-on: ubuntu-latest @@ -72,7 +75,7 @@ jobs: ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:${{ needs.makeTagAndRelease.outputs.tag_name }}, ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:latest - deploy: + deploy: runs-on: ubuntu-latest needs: [buildImageAndPush] env: @@ -86,10 +89,9 @@ jobs: aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }} aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }} - - name: 인스턴스 ID 가져오기 (Target: dev-ec2-yogiss) + - name: "인스턴스 ID 가져오기 (Target: dev-ec2-yogiss)" id: get_instance_id run: | - # Values 부분을 dev-ec2-yogiss로 수정하여 통합 서버로 배포합니다. INSTANCE_ID=$(aws ec2 describe-instances --filters "Name=tag:Name,Values=dev-ec2-yogiss" "Name=instance-state-name,Values=running" --query "Reservations[].Instances[].InstanceId" --output text) echo "INSTANCE_ID=$INSTANCE_ID" >> $GITHUB_ENV echo "찾은 인스턴스 ID: $INSTANCE_ID" @@ -120,7 +122,6 @@ jobs: docker pull ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:latest echo "=== 기존 Anidoc 컨테이너 정리 ===" - # app1 대신 anidoc-app 이름을 사용하여 여기쓰(app1)와 충돌을 방지합니다. if docker stop anidoc-app 2>/dev/null; then echo "✅ 기존 anidoc-app 중지됨" fi @@ -132,16 +133,12 @@ jobs: docker network ls | grep common || docker network create common echo "=== 새 컨테이너 실행 (Port: 8082) ===" - # 포트를 8082로 할당하여 여기쓰(8080/8081)와 독립적으로 운영합니다. if docker run -d --network common --name anidoc-app -p 8082:8080 ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:latest; then echo "✅ anidoc-app 실행 성공" - echo "=== 배포 상태 확인 ===" docker ps -a | grep anidoc-app - echo "=== 실행 로그 확인 (최근 50줄) ===" docker logs --tail 50 anidoc-app - echo "=== 포트 리스닝 확인 ===" netstat -tlnp | grep 8082 || echo "⚠️ 8082 포트 확인 필요" else From dfe2c94856db0f6f749df35462f1d4a68093e481 Mon Sep 17 00:00:00 2001 From: Vincentius7 <124507621+Vincentius7@users.noreply.github.com> Date: Thu, 5 Feb 2026 17:56:59 +0900 Subject: [PATCH 2/3] Update deployment Removed 'dev' branch from deployment triggers. --- .github/workflows/deploy.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 6d12583..9e67c07 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -8,7 +8,6 @@ on: - "backend/settings.gradle.kts" - "backend/Dockerfile" branches: - - dev - main workflow_dispatch: From 0d847f4a64f1b88e2c28e0e9d8e5720b0c3455ed Mon Sep 17 00:00:00 2001 From: vincentius Date: Thu, 5 Feb 2026 18:03:40 +0900 Subject: [PATCH 3/3] =?UTF-8?q?mysql=20=EC=A3=BC=EC=86=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/src/main/resources/application-prod.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/src/main/resources/application-prod.yml b/backend/src/main/resources/application-prod.yml index 4fe4d55..b54ff05 100644 --- a/backend/src/main/resources/application-prod.yml +++ b/backend/src/main/resources/application-prod.yml @@ -10,7 +10,7 @@ custom: spring: datasource: - url: jdbc:mysql://mysql_1:3306/anidocdb?serverTimezone=Asia/Seoul + url: jdbc:mysql://mysql-anidoc:3306/anidocdb?serverTimezone=Asia/Seoul username: petner password: petner driver-class-name: com.mysql.cj.jdbc.Driver