Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
INB
eTRANSAFE
pretox-rest-api
Commits
3ced7a4e
Commit
3ced7a4e
authored
Jan 17, 2022
by
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
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
.gitlab-ci.yml
View file @
3ced7a4e
...
...
@@ -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
:
...
...
src/main/java/es/bsc/inb/ades/rest/api/controllers/LivenessController.java
View file @
3ced7a4e
...
...
@@ -13,7 +13,7 @@ public class LivenessController {
return
"true"
;
}
@GetMapping
(
path
=
"/read
e
ness"
)
@GetMapping
(
path
=
"/read
i
ness"
)
public
String
readeness
()
{
return
"true"
;
}
...
...
src/main/java/es/bsc/inb/ades/rest/api/security/basic/inmemory/SecurityConfig.java
View file @
3ced7a4e
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment