From e55d7603f6561260f28f3ec67e2b5e9e6e668bc8 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Wed, 31 Jan 2024 22:02:26 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat=20:=20CICD=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index e83f9857..cf32181d 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -1,7 +1,7 @@ name: CD on: - push: + pull_request: branches: [ "main" ] env: @@ -60,7 +60,7 @@ jobs: -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh echo "docker pull prom/prometheus" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v home/ubuntu/docker-compose/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh + echo "docker run -d -p 9090:9090 -v home/ubuntu/docker-compose/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh From 54eab3aea05eabbf11bf7427f4cbb353ae71da3b Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 10:47:11 +0900 Subject: [PATCH 02/11] =?UTF-8?q?feat=20:=20webconfig=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/bc1/gream/global/security/WebSecurityConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/bc1/gream/global/security/WebSecurityConfig.java b/src/main/java/bc1/gream/global/security/WebSecurityConfig.java index 0816f8bb..c4cbe89e 100644 --- a/src/main/java/bc1/gream/global/security/WebSecurityConfig.java +++ b/src/main/java/bc1/gream/global/security/WebSecurityConfig.java @@ -118,6 +118,7 @@ private void settingRequestAuthorization(HttpSecurity http) throws Exception { .requestMatchers(HttpMethod.GET, "/api/admin/**").hasAuthority(UserRole.ADMIN.getAuthority()) // health 체크 .requestMatchers(HttpMethod.GET, "/actuator/**").permitAll() + .requestMatchers(HttpMethod.GET, "/actuator").permitAll() // Swagger .requestMatchers(HttpMethod.GET, "/v3/api-docs/**", "/swagger-ui/**", "/swagger-ui.html").permitAll() // 그 외 From a46db9a4ed58ce30dca5c87c0d47da8afb8d47ed Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:15:32 +0900 Subject: [PATCH 03/11] =?UTF-8?q?feat=20:=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9C=84=EC=B9=98=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index cf32181d..88c99b69 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,8 +59,7 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "docker pull prom/prometheus" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v home/ubuntu/docker-compose/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh + echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh From e1821237e776cb78cb4e5fc078f1b2930025db94 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 11:36:14 +0900 Subject: [PATCH 04/11] =?UTF-8?q?feat=20:=20cd=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index 88c99b69..f518b893 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,7 +59,7 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheus/prometheus.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh + echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh From a4a9084bf1a97334d8d46a1226cb5436a1ee0122 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:10:04 +0900 Subject: [PATCH 05/11] =?UTF-8?q?feat=20:=20ec2=20ip=20docker=20=EC=8B=A4?= =?UTF-8?q?=ED=96=89=EC=8B=9C=20=ED=99=98=EA=B2=BD=EB=B3=80=EC=88=98?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index f518b893..e9433f78 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,7 +59,8 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh + echo "HOST_IP=$(hostname -I | cut -d' ' -f1)" + echo "docker run -d -p 9090:9090 -e URL=$HOST_IP:8080 -e -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh From 6724328e5a632a4df9cb099237e5cb1f4cf9755e Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:19:12 +0900 Subject: [PATCH 06/11] =?UTF-8?q?feat=20:=20cd=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index e9433f78..44c286ed 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -60,7 +60,7 @@ jobs: -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh echo "HOST_IP=$(hostname -I | cut -d' ' -f1)" - echo "docker run -d -p 9090:9090 -e URL=$HOST_IP:8080 -e -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh + echo "docker run -d -p 9090:9090 -v -e URL=$HOST_IP:8080 -e /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh From 994e7d13368b278014f8db0dab0644dfa333a988 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:30:09 +0900 Subject: [PATCH 07/11] =?UTF-8?q?feat=20:=20script=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index 44c286ed..ddef1cc8 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,11 +59,10 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "HOST_IP=$(hostname -I | cut -d' ' -f1)" + echo "HOST_IP=$(hostname -I | cut -d' ' -f1)" >> scripts/deploy.sh echo "docker run -d -p 9090:9090 -v -e URL=$HOST_IP:8080 -e /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh - - name: upload to s3 env: IMAGE_TAG: ${{ github.sha }} From 18caba5791354486ffdf8069120d6b36acce1b61 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 15:54:17 +0900 Subject: [PATCH 08/11] =?UTF-8?q?feat=20:=20script=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index ddef1cc8..5ff9c3c6 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,8 +59,6 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh - echo "HOST_IP=$(hostname -I | cut -d' ' -f1)" >> scripts/deploy.sh - echo "docker run -d -p 9090:9090 -v -e URL=$HOST_IP:8080 -e /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh - name: upload to s3 From 12ecda8c2737fe0b603fd399613362c9e504f1e9 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:29:04 +0900 Subject: [PATCH 09/11] =?UTF-8?q?feat=20:=20cd=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index 5ff9c3c6..f9a9e6c9 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -59,6 +59,7 @@ jobs: -e TOSS_CLIENT_API_KEY=${{ secrets.TOSS_CLIENT_API_KEY }} -e TOSS_FAIL_URL=${{ secrets.TOSS_FAIL_URL }} \ -e TOSS_SECRET_API_KEY=${{ secrets.TOSS_SECRET_API_KEY }} -e TOSS_SUCCESS_URL=${{ secrets.TOSS_SUCCESS_URL }} \ -e PROFILE=prod -d --restart always --name csbroker-api $ECR_REGISTRY/$ECR_REPOSITORY:$IMAGE_TAG" >> scripts/deploy.sh + echo "docker run -d -p 9090:9090 -v /home/ubuntu/docker-compose/prometheous/promethous.yml:/etc/prometheus/prometheus.yml --name prometheus prom/prometheus" >> scripts/deploy.sh - name: upload to s3 From 79713175739b9abb79bb75e5d81898ad82b07d25 Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 16:50:33 +0900 Subject: [PATCH 10/11] =?UTF-8?q?feat=20:=20test=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/cd-v2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd-v2.yml b/.github/workflows/cd-v2.yml index f9a9e6c9..9cc81114 100644 --- a/.github/workflows/cd-v2.yml +++ b/.github/workflows/cd-v2.yml @@ -1,7 +1,7 @@ name: CD on: - pull_request: + push: branches: [ "main" ] env: From 62289823a6b0130e1d02b863ca613c504362ccde Mon Sep 17 00:00:00 2001 From: Binsreoun <69248377+Binsreoun@users.noreply.github.com> Date: Thu, 1 Feb 2024 17:42:48 +0900 Subject: [PATCH 11/11] =?UTF-8?q?feat=20:=20time=20out=20=EC=8B=9C?= =?UTF-8?q?=EA=B0=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7aa26a1c..3cdc2019 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -54,6 +54,8 @@ cloud: access-key: ${S3_ACCESS_KEY} secret-key: ${S3_SECRET_ACCESS_KEY} + + # OAuth2 oauth2: kakao: @@ -77,5 +79,6 @@ management: # tomcat was 메트릭으로 변경 server: tomcat: + connection-timeout: 1800000 mbeanregistry: enabled: true \ No newline at end of file