From de74f462a0e4270f31f65e1a611e045bc38cb058 Mon Sep 17 00:00:00 2001 From: janghyunjun Date: Tue, 5 Aug 2025 22:39:22 +0900 Subject: [PATCH 1/4] [chore] deploy.sh gitignore (#144) --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 69b50fe50..b10e200c4 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ !**/src/main/**/build/ !**/src/test/**/build/ *.yml +deploy.sh ### STS ### .apt_generated From 5018acc1544a8349b1a02a0d60347dede2b5b70e Mon Sep 17 00:00:00 2001 From: janghyunjun Date: Tue, 5 Aug 2025 22:39:37 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[chore]=20actuator=20=EC=9D=98=EC=A1=B4?= =?UTF-8?q?=EC=84=B1=20=EC=A3=BC=EC=9E=85=20(#144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.gradle b/build.gradle index f85de9560..977c9c573 100644 --- a/build.gradle +++ b/build.gradle @@ -74,6 +74,8 @@ dependencies { // Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.8' + + implementation 'org.springframework.boot:spring-boot-starter-actuator' } def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile From a973283b527595f9910c2c8734ec62d4abcfe6b7 Mon Sep 17 00:00:00 2001 From: janghyunjun Date: Tue, 5 Aug 2025 22:39:53 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[chore]=20actuator=20=ED=99=94=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?(#144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/filter/JwtAuthenticationFilter.java | 3 ++- src/main/java/konkuk/thip/config/SecurityConfig.java | 12 ++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java b/src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java index 3cf0920da..a4436ab84 100644 --- a/src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java +++ b/src/main/java/konkuk/thip/common/security/filter/JwtAuthenticationFilter.java @@ -85,7 +85,8 @@ protected boolean shouldNotFilter(HttpServletRequest request) { || path.startsWith("/v3/api-docs") || path.startsWith("/api-docs") || path.startsWith("/oauth2/authorization") - || path.startsWith("/login/oauth2/code"); + || path.startsWith("/login/oauth2/code") + ; } } diff --git a/src/main/java/konkuk/thip/config/SecurityConfig.java b/src/main/java/konkuk/thip/config/SecurityConfig.java index be64fa06b..beb014447 100644 --- a/src/main/java/konkuk/thip/config/SecurityConfig.java +++ b/src/main/java/konkuk/thip/config/SecurityConfig.java @@ -43,16 +43,8 @@ public class SecurityConfig { private static final String[] WHITELIST = { "/swagger-ui/**", "/api-docs/**", "/swagger-ui.html", "/v3/api-docs/**","/oauth2/authorization/**", - "/login/oauth2/code/**", - -// //테스트를 위한 url - "/api/test/public", - "/api/test/auth-status", - "/api/test/protected", - "/auth/kakao/**", - "/kakao-login-test.html", - "/google-login-test.html", - "/index.html", + "/login/oauth2/code/**", "/actuator/health", + }; @Bean From 07be6d954c367183d3d90a90601cfd35dfed7799 Mon Sep 17 00:00:00 2001 From: janghyunjun Date: Tue, 5 Aug 2025 22:40:05 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[chore]=20cd=EC=97=90=EC=84=9C=20deploy.sh?= =?UTF-8?q?=20=EC=8B=A4=ED=96=89=20(#144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-workflow-dev.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cd-workflow-dev.yml b/.github/workflows/cd-workflow-dev.yml index 70af0eba6..c1a0f4b38 100644 --- a/.github/workflows/cd-workflow-dev.yml +++ b/.github/workflows/cd-workflow-dev.yml @@ -67,14 +67,17 @@ jobs: echo "🗂️ Change Directory to Compose Path" cd ${{ env.COMPOSE_PATH }} - echo "✋🏻Stopping existing container and Cleaning up old images" - sudo docker-compose down --rmi all +# echo "✋🏻Stopping existing container and Cleaning up old images" +# sudo docker-compose down --rmi all sudo docker ps -a echo "🥳 Pulling new image" sudo docker pull ${{ secrets.DOCKER_USERNAME }}/${{ secrets.DOCKER_IMAGE }} + + echo "🚀 Run Blue-Green Deploy Script" + sudo bash deploy.sh - echo "🌱 Starting new container" - sudo docker-compose up -d - sudo docker image prune -f \ No newline at end of file +# echo "🌱 Starting new container" +# sudo docker-compose up -d +# sudo docker image prune -f \ No newline at end of file