From 328fc078faebd8da1e38bb60b09da326fa189f49 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:35:35 +0900 Subject: [PATCH 1/8] =?UTF-8?q?chore:=20docker=20=EB=AA=85=EB=A0=B9?= =?UTF-8?q?=EC=96=B4=20sudo=20=EB=B6=80=EC=97=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-java.yml | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index e76e5f5c..ed4ac386 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -1,9 +1,12 @@ name: Deploy on: - workflow_run: - workflows: ["CI (Java)", "CI (Python/FastAPI)"] - types: [completed] + push: + branches: + - fix/** +# workflow_run: +# workflows: ["CI (Java)", "CI (Python/FastAPI)"] +# types: [completed] jobs: @@ -11,9 +14,9 @@ jobs: name: Deploy to AWS EC2 runs-on: ubuntu-latest if: | - github.event.workflow_run.conclusion == 'success' && - (startsWith(github.event.workflow_run.head_branch, 'user-service-v') || - startsWith(github.event.workflow_run.head_branch, 'pre-processing-v')) +# github.event.workflow_run.conclusion == 'success' && +# (startsWith(github.event.workflow_run.head_branch, 'user-service-v') || +# startsWith(github.event.workflow_run.head_branch, 'pre-processing-v')) steps: @@ -68,16 +71,16 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest - docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest + sudo docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest + sudo docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest - docker compose down - docker compose up -d + sudo docker compose down + sudo docker compose up -d sleep 10 - docker compose ps + sudo docker compose ps - docker image prune -f + sudo docker image prune -f - name: Send Discord notification - Success if: success() From 2144cca6dab73f29cf122d0cc0bb3d57ef58314c Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:38:44 +0900 Subject: [PATCH 2/8] =?UTF-8?q?chore:=20working=20directory=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EB=AA=85=EB=A0=B9=EC=96=B4=20=EC=9E=84=EC=8B=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-java.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index ed4ac386..c9802330 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -71,16 +71,18 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - sudo docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest - sudo docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest +# docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest +# docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest - sudo docker compose down - sudo docker compose up -d + ls + + docker compose down + docker compose up -d sleep 10 - sudo docker compose ps + docker compose ps - sudo docker image prune -f + docker image prune -f - name: Send Discord notification - Success if: success() From 86ab0e16971684b83101f04501d013b461af1abc Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:39:53 +0900 Subject: [PATCH 3/8] chore: fix ls --- .github/workflows/deploy-java.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index c9802330..f54f4894 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -71,10 +71,7 @@ jobs: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin -# docker pull ghcr.io/${{ env.REPO_LC }}/user-service:latest -# docker pull ghcr.io/${{ env.REPO_LC }}/pre-processing-service:latest - - ls + echo ls docker compose down docker compose up -d From 113927b53e4e1f0c3fc60c97bec0a31773777194 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:44:30 +0900 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20Docker=20compose=20=EB=AA=85?= =?UTF-8?q?=EB=A0=B9=EC=96=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit docker compose -> docker-compose --- .github/workflows/deploy-java.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index f54f4894..3104c268 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -73,11 +73,11 @@ jobs: echo ls - docker compose down - docker compose up -d + docker-compose down + docker-compose up -d sleep 10 - docker compose ps + docker-compose ps docker image prune -f From 833ac967b4fa26d002abc8a222e0a4989528e81c Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:46:56 +0900 Subject: [PATCH 5/8] chore: user service 443 port open --- docker/production/docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml index fa3ca0cc..fdf4dcf2 100644 --- a/docker/production/docker-compose.yml +++ b/docker/production/docker-compose.yml @@ -7,6 +7,7 @@ services: restart: always ports: - "80:8080" + - "443:8080" networks: - app-network env_file: From 59ae82873a8aa2c5a60225f98c49a7412310fd88 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:51:34 +0900 Subject: [PATCH 6/8] chore: production profile to spring boot --- docker/production/docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/production/docker-compose.yml b/docker/production/docker-compose.yml index fdf4dcf2..be22e934 100644 --- a/docker/production/docker-compose.yml +++ b/docker/production/docker-compose.yml @@ -12,6 +12,8 @@ services: - app-network env_file: - .env.prod + environment: + - SPRING_PROFILES_ACTIVE=production pre-processing-service: image: ghcr.io/kernel180-be12/final-4team-icebang/pre-processing-service:latest From d185e14395abce9c408e327ccb55c89e16dfc6d9 Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:55:06 +0900 Subject: [PATCH 7/8] =?UTF-8?q?chore:=20ci=20trigger=20=EC=A1=B0=EA=B1=B4?= =?UTF-8?q?=20=EC=9B=90=EB=B3=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-java.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/deploy-java.yml b/.github/workflows/deploy-java.yml index 3104c268..1792e345 100644 --- a/.github/workflows/deploy-java.yml +++ b/.github/workflows/deploy-java.yml @@ -4,9 +4,9 @@ on: push: branches: - fix/** -# workflow_run: -# workflows: ["CI (Java)", "CI (Python/FastAPI)"] -# types: [completed] + workflow_run: + workflows: ["CI (Java)", "CI (Python/FastAPI)"] + types: [completed] jobs: @@ -14,21 +14,13 @@ jobs: name: Deploy to AWS EC2 runs-on: ubuntu-latest if: | -# github.event.workflow_run.conclusion == 'success' && -# (startsWith(github.event.workflow_run.head_branch, 'user-service-v') || -# startsWith(github.event.workflow_run.head_branch, 'pre-processing-v')) + github.event.workflow_run.conclusion == 'success' && + (startsWith(github.event.workflow_run.head_branch, 'user-service-v') || + startsWith(github.event.workflow_run.head_branch, 'pre-processing-v')) steps: - uses: actions/checkout@v4 - -# - name: Dump workflow_run event payload -# run: | -# echo "---- Full workflow_run payload ----" -# echo "${{ toJson(github.event) }}" | jq -# echo exit -1 - - - name: Create env file run: | echo "DB_HOST=${{ secrets.DB_HOST }}" > .env.prod From 589f8138ad8942256068982d7d5b17312624502b Mon Sep 17 00:00:00 2001 From: can019 Date: Thu, 11 Sep 2025 12:56:03 +0900 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20production=20=ED=99=98=EA=B2=BD?= =?UTF-8?q?=EC=97=90=EC=84=9C=20email=20service=20mock=20service=EB=A1=9C?= =?UTF-8?q?=20=EB=8C=80=EC=B2=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/icebang/domain/email/service/MockEmailService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java index d4392fe5..c4bff4f5 100644 --- a/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java +++ b/apps/user-service/src/main/java/site/icebang/domain/email/service/MockEmailService.java @@ -8,7 +8,7 @@ import site.icebang.domain.email.dto.EmailRequest; @Service -@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop"}) +@Profile({"test-unit", "test-e2e", "test-integration", "local", "develop", "production"}) @Slf4j public class MockEmailService implements EmailService {