Commit 3ced7a4e authored by jcorvi's avatar jcorvi
Browse files

Merge branch 'develop' into 'toxhub-int'

Develop

See merge request !19
parents 0b2d2ffd ab99ea4f
Pipeline #26861 failed with stage
in 0 seconds
......@@ -5,7 +5,8 @@ variables:
DOCKER_REGISTRY: registry.gitlab.bsc.es
#any doubts regarind gitlab ci cd enviroment variables go to
#https://docs.gitlab.com/ee/ci/variables/predefined_variables.html
IMAGE_FULL_PATH: $DOCKER_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_REF_NAME
#IMAGE_FULL_PATH: $DOCKER_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_REF_NAME
IMAGE_FULL_PATH: $DOCKER_REGISTRY/$CI_PROJECT_PATH:latest_develop
stages:
- build
build_docker_image:
......
......@@ -13,7 +13,7 @@ public class LivenessController {
return "true";
}
@GetMapping(path = "/readeness")
@GetMapping(path = "/readiness")
public String readeness() {
return "true";
}
......
......@@ -13,9 +13,13 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
protected void configure(HttpSecurity http) throws Exception {
http.cors().and().csrf().disable().
//http.csrf().disable().
authorizeRequests().antMatchers(HttpMethod.OPTIONS, "/**").permitAll().anyRequest().authenticated()
authorizeRequests().
antMatchers(HttpMethod.OPTIONS, "/**").permitAll().
antMatchers(HttpMethod.GET, "/liveness").permitAll().
antMatchers(HttpMethod.GET, "/readiness").permitAll().anyRequest().authenticated()
.and().httpBasic();
}
@Autowired
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment