Skip to content

Commit

Permalink
Bugfix/spring config location (#58)
Browse files Browse the repository at this point in the history
`SPRING_CONFIG_LOCATION=/opt/application.yaml` (Dockerfile update for #44)
+ cleanup, typos, formatting
  • Loading branch information
dk1844 authored Aug 1, 2023
1 parent 295afff commit f6e9a1c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion service/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COPY $CONFIG /opt/application.yaml
# deploy as root application in tomcat
COPY ${LS_PREFIX}/target/scala-2.12/*.war /usr/local/tomcat/webapps/ROOT.war

ENV SPRING_CONFIG_ADDITIONAL-LOCATION=/opt/application.yaml
ENV SPRING_CONFIG_LOCATION=/opt/application.yaml

ENV http_proxy=$BUILD_PROXY
ENV https_proxy=$BUILD_PROXY
Expand Down
18 changes: 9 additions & 9 deletions service/src/main/resources/example.application.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ loginsvc:
alg-name: "RS256"
config:
some-key: "BETA"
#Generates git.properties file for use on info endpoint.
# Generates git.properties file for use on info endpoint.
git-info:
#Generate Git Information on each run of the application.
# Generate Git Information on each run of the application.
generate-git-properties: true
#Generate git.properties file on application startup.
#Generate-git-properties must be true for this config to take effect.
#Once file has been generated, you may set these properties to false as the application will now read the details from the generated file on start-up.
# Generate git.properties file on application startup.
# Generate-git-properties must be true for this config to take effect.
# Once file has been generated, you may set these properties to false as the application will now read the details from the generated file on start-up.
generate-git-properties-file: false

# Rest Auth Config (AD)
Expand Down Expand Up @@ -61,20 +61,20 @@ springdoc:
management:
health:
ldap:
#TODO: Enable Ldap check for actuator/health when fully Implemented - issue #34
# TODO: Enable Ldap check for actuator/health when fully Implemented - issue #34
enabled: "false"
# Expose information under Actuator/info
info:
# Exposes any property marked under "info" in the config
env:
enabled: "true"
#Exposes git related information from the git.properties file
# Exposes git related information from the git.properties file
git:
enabled: "true"
#Exposes Java runtime information
# Exposes Java runtime information
java:
enabled: "true"
#Exposes build information
# Exposes build information
build:
enabled: "true"
endpoints:
Expand Down

0 comments on commit f6e9a1c

Please sign in to comment.