Skip to content
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
13 changes: 8 additions & 5 deletions .github/workflows/cd-workflow-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
# echo "🌱 Starting new container"
# sudo docker-compose up -d
# sudo docker image prune -f
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ build/
!**/src/main/**/build/
!**/src/test/**/build/
*.yml
deploy.sh

### STS ###
.apt_generated
Expand Down
2 changes: 2 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
;
}

}
12 changes: 2 additions & 10 deletions src/main/java/konkuk/thip/config/SecurityConfig.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down