Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CICD 변경 #220

Merged
merged 11 commits into from
Feb 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/cd-v2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,9 +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:/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


- name: upload to s3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()
// 그 외
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ cloud:
access-key: ${S3_ACCESS_KEY}
secret-key: ${S3_SECRET_ACCESS_KEY}



# OAuth2
oauth2:
kakao:
Expand All @@ -77,5 +79,6 @@ management:
# tomcat was 메트릭으로 변경
server:
tomcat:
connection-timeout: 1800000
mbeanregistry:
enabled: true
Loading