From c6ff9194b86af6cc19e30893599b26c02f8e1610 Mon Sep 17 00:00:00 2001 From: elive7 Date: Sun, 13 Apr 2025 18:34:12 +0900 Subject: [PATCH 1/9] =?UTF-8?q?hotfix:=20=EC=A4=91=EB=B3=B5=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EB=A1=9C=EC=A7=81=20=EC=9B=90=EC=83=81?= =?UTF-8?q?=EB=B3=B5=EA=B7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../authentication/interceptor/DeviceIdInterceptor.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/java/com/projectlyrics/server/domain/auth/authentication/interceptor/DeviceIdInterceptor.java b/src/main/java/com/projectlyrics/server/domain/auth/authentication/interceptor/DeviceIdInterceptor.java index 3d62b0a5..74a28efe 100644 --- a/src/main/java/com/projectlyrics/server/domain/auth/authentication/interceptor/DeviceIdInterceptor.java +++ b/src/main/java/com/projectlyrics/server/domain/auth/authentication/interceptor/DeviceIdInterceptor.java @@ -3,7 +3,6 @@ import com.projectlyrics.server.domain.auth.authentication.AuthContext; import com.projectlyrics.server.domain.auth.exception.NotRegisteredDeviceException; import com.projectlyrics.server.domain.auth.repository.AuthRepository; -import com.projectlyrics.server.domain.user.exception.UserNotFoundException; import com.projectlyrics.server.domain.user.repository.UserQueryRepository; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; @@ -59,9 +58,6 @@ private boolean hasNoAuth() { } private boolean isOldDevice(String deviceId) { - return userQueryRepository.findById(authContext.getId()) - .map(user -> authRepository.findBySocialIdAndDeviceId(user.getSocialInfo().getSocialId(), deviceId)) - .orElseThrow(() -> new UserNotFoundException()) - .isEmpty(); + return authRepository.findByDeviceId(deviceId).isEmpty(); } } From 7e0eb822cd714e44cddbff6c41f1336a64e94d3d Mon Sep 17 00:00:00 2001 From: "jin.geonwoo" Date: Fri, 5 Sep 2025 22:42:20 +0900 Subject: [PATCH 2/9] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B9=85=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/projectlyrics/server/ServerApplicationTests.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/com/projectlyrics/server/ServerApplicationTests.java b/src/test/java/com/projectlyrics/server/ServerApplicationTests.java index 38cf0ead..4492c543 100644 --- a/src/test/java/com/projectlyrics/server/ServerApplicationTests.java +++ b/src/test/java/com/projectlyrics/server/ServerApplicationTests.java @@ -8,6 +8,7 @@ class ServerApplicationTests { @Test void contextLoads() { +p System.out.println("hello world"); } } From e14d90d865c6f9d29b14d2dd21d7724c8cad78b0 Mon Sep 17 00:00:00 2001 From: "jin.geonwoo" Date: Fri, 5 Sep 2025 22:45:19 +0900 Subject: [PATCH 3/9] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B9=85=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/projectlyrics/server/ServerApplicationTests.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/test/java/com/projectlyrics/server/ServerApplicationTests.java b/src/test/java/com/projectlyrics/server/ServerApplicationTests.java index 4492c543..38cf0ead 100644 --- a/src/test/java/com/projectlyrics/server/ServerApplicationTests.java +++ b/src/test/java/com/projectlyrics/server/ServerApplicationTests.java @@ -8,7 +8,6 @@ class ServerApplicationTests { @Test void contextLoads() { -p System.out.println("hello world"); } } From fa3cb0330d6b778ebd2b250d01039493e079b9e6 Mon Sep 17 00:00:00 2001 From: "jin.geonwoo" Date: Sat, 6 Sep 2025 02:14:02 +0900 Subject: [PATCH 4/9] =?UTF-8?q?settings:=20=ED=82=A4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Dev-CI-CD.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/Dev-CI-CD.yml b/.github/workflows/Dev-CI-CD.yml index edf45d17..1426e30e 100644 --- a/.github/workflows/Dev-CI-CD.yml +++ b/.github/workflows/Dev-CI-CD.yml @@ -78,7 +78,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.KEY }} + key: ${{ secrets.NEW_KEY }} source: ./scripts/deploy-dev.sh target: /home/ubuntu/ @@ -87,7 +87,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.KEY }} + key: ${{ secrets.NEW_KEY }} source: ./docker-compose-dev.yml target: /home/ubuntu/ @@ -96,7 +96,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.KEY }} + key: ${{ secrets.NEW_KEY }} source: firebase-key.json target: /home/ubuntu/ @@ -107,7 +107,7 @@ jobs: with: host: ${{ secrets.HOST_DEV }} username: ubuntu - key: ${{ secrets.KEY }} + key: ${{ secrets.NEW_KEY }} envs: GITHUB_SHA script: | sudo docker login -u ${{ secrets.DOCKERHUB_USERNAME }} -p ${{ secrets.DOCKERHUB_PASSWORD }} From da4dd53c7d9ab6a8dee7be1d6c4954b7e57d6692 Mon Sep 17 00:00:00 2001 From: "jin.geonwoo" Date: Sat, 6 Sep 2025 13:50:40 +0900 Subject: [PATCH 5/9] =?UTF-8?q?settings:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EB=82=B4=EC=9A=A9=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 --- scripts/deploy-dev.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/deploy-dev.sh b/scripts/deploy-dev.sh index 45f46d42..7cec6719 100644 --- a/scripts/deploy-dev.sh +++ b/scripts/deploy-dev.sh @@ -17,9 +17,9 @@ if [ -z "$IS_GREEN_EXIST" ];then echo ">>> pull green image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old green container" - docker compose -f docker-compose-dev.yml rm -fs green + docker compose -f ../docker-compose-dev.yml rm -fs green echo ">>> up green container" - docker compose -f docker-compose-dev.yml up -d green + docker compose -f ../docker-compose-dev.yml up -d green while [ 1 = 1 ]; do echo ">>> green health check ..." sleep 3 @@ -34,7 +34,7 @@ if [ -z "$IS_GREEN_EXIST" ];then sudo cp /etc/nginx/conf.d/green-url.inc /etc/nginx/conf.d/service-url.inc sudo nginx -s reload echo ">>> down blue container" - docker compose -f docker-compose-dev.yml stop blue + docker compose -f ../docker-compose-dev.yml stop blue docker image prune -f # blue up @@ -43,9 +43,9 @@ else echo ">>> pull blue image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old blue container" - docker compose -f docker-compose-dev.yml rm -fs blue + docker compose -f ../docker-compose-dev.yml rm -fs blue echo ">>> up blue container" - docker compose -f docker-compose-dev.yml up -d blue + docker compose -f ../docker-compose-dev.yml up -d blue while [ 1 = 1 ]; do echo ">>> blue health check ..." sleep 3 @@ -60,6 +60,6 @@ else sudo cp /etc/nginx/conf.d/blue-url.inc /etc/nginx/conf.d/service-url.inc sudo nginx -s reload echo ">>> down green container" - docker compose -f docker-compose-dev.yml stop green + docker compose -f ../docker-compose-dev.yml stop green docker image prune -f fi From 1a8c014daab6b6037472ff5da11c0eb36a11d5de Mon Sep 17 00:00:00 2001 From: elive7 Date: Mon, 8 Sep 2025 00:55:52 +0900 Subject: [PATCH 6/9] =?UTF-8?q?settings:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EB=82=B4=EC=9A=A9=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 --- scripts/deploy-dev.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/deploy-dev.sh b/scripts/deploy-dev.sh index 7cec6719..147c42d6 100644 --- a/scripts/deploy-dev.sh +++ b/scripts/deploy-dev.sh @@ -1,5 +1,7 @@ #!/bin/bash +cd /home/ubuntu + IS_GREEN_EXIST=$(docker ps | grep green) IS_REDIS_EXIST=$(docker ps | grep redis) @@ -17,9 +19,9 @@ if [ -z "$IS_GREEN_EXIST" ];then echo ">>> pull green image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old green container" - docker compose -f ../docker-compose-dev.yml rm -fs green + docker compose rm -fs green echo ">>> up green container" - docker compose -f ../docker-compose-dev.yml up -d green + docker compose up -d green while [ 1 = 1 ]; do echo ">>> green health check ..." sleep 3 @@ -34,7 +36,7 @@ if [ -z "$IS_GREEN_EXIST" ];then sudo cp /etc/nginx/conf.d/green-url.inc /etc/nginx/conf.d/service-url.inc sudo nginx -s reload echo ">>> down blue container" - docker compose -f ../docker-compose-dev.yml stop blue + docker compose stop blue docker image prune -f # blue up @@ -43,9 +45,9 @@ else echo ">>> pull blue image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old blue container" - docker compose -f ../docker-compose-dev.yml rm -fs blue + docker compose rm -fs blue echo ">>> up blue container" - docker compose -f ../docker-compose-dev.yml up -d blue + docker compose up -d blue while [ 1 = 1 ]; do echo ">>> blue health check ..." sleep 3 @@ -62,4 +64,4 @@ else echo ">>> down green container" docker compose -f ../docker-compose-dev.yml stop green docker image prune -f -fi +fi \ No newline at end of file From 78c92e00302206999fa2a521c1233e0c0f1ea336 Mon Sep 17 00:00:00 2001 From: elive7 Date: Mon, 8 Sep 2025 01:00:49 +0900 Subject: [PATCH 7/9] =?UTF-8?q?settings:=20=EC=8A=A4=ED=81=AC=EB=A6=BD?= =?UTF-8?q?=ED=8A=B8=20=ED=8C=8C=EC=9D=BC=20=EB=82=B4=EC=9A=A9=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 --- scripts/deploy-dev.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/scripts/deploy-dev.sh b/scripts/deploy-dev.sh index 147c42d6..e3252b2a 100644 --- a/scripts/deploy-dev.sh +++ b/scripts/deploy-dev.sh @@ -1,7 +1,5 @@ #!/bin/bash -cd /home/ubuntu - IS_GREEN_EXIST=$(docker ps | grep green) IS_REDIS_EXIST=$(docker ps | grep redis) @@ -19,9 +17,9 @@ if [ -z "$IS_GREEN_EXIST" ];then echo ">>> pull green image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old green container" - docker compose rm -fs green + docker compose -f /home/ubuntu/docker-compose-dev.yml rm -fs green echo ">>> up green container" - docker compose up -d green + docker compose -f /home/ubuntu/docker-compose-dev.yml up -d green while [ 1 = 1 ]; do echo ">>> green health check ..." sleep 3 @@ -36,7 +34,7 @@ if [ -z "$IS_GREEN_EXIST" ];then sudo cp /etc/nginx/conf.d/green-url.inc /etc/nginx/conf.d/service-url.inc sudo nginx -s reload echo ">>> down blue container" - docker compose stop blue + docker compose -f /home/ubuntu/docker-compose-dev.yml stop blue docker image prune -f # blue up @@ -45,9 +43,9 @@ else echo ">>> pull blue image" docker pull jinkonu/feelin-dev:latest echo ">>> remove old blue container" - docker compose rm -fs blue + docker compose -f /home/ubuntu/docker-compose-dev.yml rm -fs blue echo ">>> up blue container" - docker compose up -d blue + docker compose -f /home/ubuntu/docker-compose-dev.yml up -d blue while [ 1 = 1 ]; do echo ">>> blue health check ..." sleep 3 @@ -62,6 +60,6 @@ else sudo cp /etc/nginx/conf.d/blue-url.inc /etc/nginx/conf.d/service-url.inc sudo nginx -s reload echo ">>> down green container" - docker compose -f ../docker-compose-dev.yml stop green + docker compose -f /home/ubuntu/docker-compose-dev.yml stop green docker image prune -f fi \ No newline at end of file From 85d3e01faf76f947ade52b348e6b11b9d9178f1c Mon Sep 17 00:00:00 2001 From: elive7 Date: Tue, 9 Sep 2025 16:53:49 +0900 Subject: [PATCH 8/9] =?UTF-8?q?settings:=20Dockerfile=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - JVM 메모리 제한 둠 --- Dockerfile.dev | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile.dev b/Dockerfile.dev index 86bfead9..79656175 100644 --- a/Dockerfile.dev +++ b/Dockerfile.dev @@ -1,9 +1,8 @@ FROM openjdk:21-jdk-slim ARG JAR_FILE=./build/libs/*.jar - COPY ${JAR_FILE} server.jar EXPOSE 8080 -ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=dev", "server.jar"] +ENTRYPOINT ["java", "-Xms256m", "-Xmx512m", "-Dspring.profiles.active=dev", "-jar", "server.jar"] \ No newline at end of file From 38b1ed52c93db1310e8f47820582010a64185273 Mon Sep 17 00:00:00 2001 From: elive7 Date: Tue, 9 Sep 2025 17:10:12 +0900 Subject: [PATCH 9/9] settings: docker-compose.yml --- docker-compose-dev.yml | 10 ++++++++-- docker-compose.yml | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 736424bc..9e93e40a 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -12,8 +12,6 @@ services: resources: limits: memory: 512M - reservations: - memory: 256M blue: container_name: blue image: jinkonu/feelin-dev:latest @@ -35,6 +33,10 @@ services: options: max-size: "10m" max-file: "5" + deploy: + resources: + limits: + memory: 512M green: container_name: green image: jinkonu/feelin-dev:latest @@ -56,6 +58,10 @@ services: options: max-size: "10m" max-file: "5" + deploy: + resources: + limits: + memory: 512M volumes: redis-data: diff --git a/docker-compose.yml b/docker-compose.yml index 2ff64219..8a6bd31a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,6 @@ services: resources: limits: memory: 512M - reservations: - memory: 256M blue: container_name: blue image: jinkonu/feelin-api:latest @@ -35,6 +33,10 @@ services: options: max-size: "10m" max-file: "5" + deploy: + resources: + limits: + memory: 512M green: container_name: green image: jinkonu/feelin-api:latest @@ -56,6 +58,10 @@ services: options: max-size: "10m" max-file: "5" + deploy: + resources: + limits: + memory: 512M volumes: redis-data: