From 8792f55c5eb806dd88319b60535f120b3912efe5 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Tue, 12 Aug 2025 21:57:04 +0900 Subject: [PATCH 1/7] =?UTF-8?q?chore:=20=EC=8A=A4=ED=94=84=EB=A7=81=20?= =?UTF-8?q?=EB=B6=80=ED=8A=B8=20=EB=B2=84=EC=A0=84=20=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 68af1c7..60ef75f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'java-library' - id 'org.springframework.boot' version '3.5.3' + id 'org.springframework.boot' version '3.4.5' id 'io.spring.dependency-management' version '1.1.7' } From 85cb1e468148a288ab5df4172e349286e5893231 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Tue, 12 Aug 2025 22:02:07 +0900 Subject: [PATCH 2/7] =?UTF-8?q?chore:=20cd=20=ED=94=84=EB=A1=9C=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=9E=84=EC=8B=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-api-prod.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd-api-prod.yml b/.github/workflows/cd-api-prod.yml index 8dce561..2dbd482 100644 --- a/.github/workflows/cd-api-prod.yml +++ b/.github/workflows/cd-api-prod.yml @@ -1,8 +1,8 @@ name: CD API PROD on: - push: - branches: [ main ] + pull_request: + branches: [ develop ] jobs: detect-changes: @@ -14,14 +14,14 @@ jobs: - id: filter uses: dorny/paths-filter@v3 with: - base: main + base: develop filters: | api: - 'api/**' build-api: needs: detect-changes - if: needs.detect-changes.outputs.api_changed == 'true' + # if: needs.detect-changes.outputs.api_changed == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -83,10 +83,10 @@ jobs: [ -d kokomen-notification ] || git clone --filter=blob:none --no-checkout https://github.com/samhap-soft/kokomen-notification.git cd kokomen-notification git sparse-checkout init --cone - git fetch origin main - git checkout main + git fetch origin feature/#16 + git checkout feature/#16 git sparse-checkout set docker/prod - git pull origin main + git pull origin feature/#16 - name: Docker Image pull run: sudo docker pull samhap/kokomen-notification-api:prod From e0191a2a5744e961a0cfdeec031959b3a484c3c4 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Tue, 12 Aug 2025 22:49:57 +0900 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20cgroup=20=EB=B3=BC=EB=A5=A8=20?= =?UTF-8?q?=EB=A7=88=EC=9A=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/prod/docker-compose-prod.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/prod/docker-compose-prod.yml b/docker/prod/docker-compose-prod.yml index 73dd388..4b2dfd3 100644 --- a/docker/prod/docker-compose-prod.yml +++ b/docker/prod/docker-compose-prod.yml @@ -29,6 +29,7 @@ services: - "8000:8000" volumes: - ./notification/internal/logs:/logs + - /sys/fs/cgroup:/sys/fs/cgroup:ro environment: TZ: Asia/Seoul JAVA_TOOL_OPTIONS: -Duser.timezone=Asia/Seoul From 642e5baf198bcba7572b7dfe0f231ab2e3284285 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Tue, 12 Aug 2025 23:00:24 +0900 Subject: [PATCH 4/7] =?UTF-8?q?chore:=20Docker=20=EB=B2=A0=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/Dockerfile | 2 +- internal/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 2ba0963..7e66657 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-jdk +FROM amazoncorretto:17 COPY build/libs/*SNAPSHOT.jar /app.jar diff --git a/internal/Dockerfile b/internal/Dockerfile index 2ba0963..7e66657 100644 --- a/internal/Dockerfile +++ b/internal/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:17-jdk +FROM amazoncorretto:17 COPY build/libs/*SNAPSHOT.jar /app.jar From 3df0448d00ee6a72a1343855713b6dab7a5b107a Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Wed, 13 Aug 2025 00:26:19 +0900 Subject: [PATCH 5/7] =?UTF-8?q?chore:=20cd=20yml=20=EC=9E=84=EC=8B=9C=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-internal-prod.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd-internal-prod.yml b/.github/workflows/cd-internal-prod.yml index b3849a3..359dc96 100644 --- a/.github/workflows/cd-internal-prod.yml +++ b/.github/workflows/cd-internal-prod.yml @@ -1,8 +1,8 @@ name: CD INTERNAL PROD on: - push: - branches: [ main ] + pull_request: + branches: [ develop ] jobs: detect-changes: @@ -14,7 +14,7 @@ jobs: - id: filter uses: dorny/paths-filter@v3 with: - base: main + base: develop filters: | internal: - 'internal/**' @@ -83,10 +83,10 @@ jobs: [ -d kokomen-notification ] || git clone --filter=blob:none --no-checkout https://github.com/samhap-soft/kokomen-notification.git cd kokomen-notification git sparse-checkout init --cone - git fetch origin main - git checkout main + git fetch origin feature/#16 + git checkout feature/#16 git sparse-checkout set docker/prod - git pull origin main + git pull origin feature/#16 - name: Docker Image pull run: sudo docker pull samhap/kokomen-notification-internal:prod From c612aa320c904c8814ebebf9ca3d6e9c46be8da8 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Wed, 13 Aug 2025 00:58:10 +0900 Subject: [PATCH 6/7] =?UTF-8?q?Revert=20"chore:=20cd=20yml=20=EC=9E=84?= =?UTF-8?q?=EC=8B=9C=20=EC=88=98=EC=A0=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 3df0448d00ee6a72a1343855713b6dab7a5b107a. --- .github/workflows/cd-internal-prod.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/cd-internal-prod.yml b/.github/workflows/cd-internal-prod.yml index 359dc96..b3849a3 100644 --- a/.github/workflows/cd-internal-prod.yml +++ b/.github/workflows/cd-internal-prod.yml @@ -1,8 +1,8 @@ name: CD INTERNAL PROD on: - pull_request: - branches: [ develop ] + push: + branches: [ main ] jobs: detect-changes: @@ -14,7 +14,7 @@ jobs: - id: filter uses: dorny/paths-filter@v3 with: - base: develop + base: main filters: | internal: - 'internal/**' @@ -83,10 +83,10 @@ jobs: [ -d kokomen-notification ] || git clone --filter=blob:none --no-checkout https://github.com/samhap-soft/kokomen-notification.git cd kokomen-notification git sparse-checkout init --cone - git fetch origin feature/#16 - git checkout feature/#16 + git fetch origin main + git checkout main git sparse-checkout set docker/prod - git pull origin feature/#16 + git pull origin main - name: Docker Image pull run: sudo docker pull samhap/kokomen-notification-internal:prod From aba531017f86d7d048b98ed127f3fa217ec68ef8 Mon Sep 17 00:00:00 2001 From: nhlee98 Date: Wed, 13 Aug 2025 00:58:11 +0900 Subject: [PATCH 7/7] =?UTF-8?q?Revert=20"chore:=20cd=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=9E=84=EC=8B=9C=20=EC=88=98=EC=A0=95"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 85cb1e468148a288ab5df4172e349286e5893231. --- .github/workflows/cd-api-prod.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cd-api-prod.yml b/.github/workflows/cd-api-prod.yml index 2dbd482..8dce561 100644 --- a/.github/workflows/cd-api-prod.yml +++ b/.github/workflows/cd-api-prod.yml @@ -1,8 +1,8 @@ name: CD API PROD on: - pull_request: - branches: [ develop ] + push: + branches: [ main ] jobs: detect-changes: @@ -14,14 +14,14 @@ jobs: - id: filter uses: dorny/paths-filter@v3 with: - base: develop + base: main filters: | api: - 'api/**' build-api: needs: detect-changes - # if: needs.detect-changes.outputs.api_changed == 'true' + if: needs.detect-changes.outputs.api_changed == 'true' runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -83,10 +83,10 @@ jobs: [ -d kokomen-notification ] || git clone --filter=blob:none --no-checkout https://github.com/samhap-soft/kokomen-notification.git cd kokomen-notification git sparse-checkout init --cone - git fetch origin feature/#16 - git checkout feature/#16 + git fetch origin main + git checkout main git sparse-checkout set docker/prod - git pull origin feature/#16 + git pull origin main - name: Docker Image pull run: sudo docker pull samhap/kokomen-notification-api:prod