Skip to content
This repository has been archived by the owner on Oct 2, 2023. It is now read-only.

Fixes #213

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fixes #213

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: 2 additions & 2 deletions Dockerfile.build
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ FROM openjdk:8-jre

VOLUME ["/hygieia/logs"]

RUN mkdir /hygieia/config
RUN mkdir -p /hygieia/config

EXPOSE 8080

Expand All @@ -30,4 +30,4 @@ COPY --from=build target/*.jar /hygieia/
COPY docker/properties-builder.sh /hygieia/

CMD ./properties-builder.sh &&\
java -Djava.security.egd=file:/dev/./urandom -jar *.jar --spring.config.location=$PROP_FILE
java -Djava.security.egd=file:/dev/./urandom -jar *.jar --spring.config.location=$PROP_FILE
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
<!-- Plugins -->
<apache.rat.plugin.version>0.13</apache.rat.plugin.version>
<coveralls.maven.plugin.version>4.3.0</coveralls.maven.plugin.version>
<jacoco.maven.plugin.version>0.8.3</jacoco.maven.plugin.version>
<jacoco.maven.plugin.version>0.8.6</jacoco.maven.plugin.version>
<jacoco.coverage.percentage.minimum>0.200</jacoco.coverage.percentage.minimum>
<jacoco.classes.missed.minimum>300</jacoco.classes.missed.minimum>
<java.compilation.source>1.8</java.compilation.source>
Expand Down
16 changes: 9 additions & 7 deletions src/main/resources/application.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
dbname=dashboarddb
dbhost=localhost
dbport=27017
dbreplicaset=false
dbhostport=localhost:27017
server.contextPath=/api
server.port=8080
dbname=${MONGODB_DBNAME}
dbhost=${SPRING_DATA_MONGODB_HOST:localhost}
dbport=${MONGODB_PORT:27017}
dbreplicaset=${MONGODB_REPLICASET:false}
dbhostport=${SPRING_DATA_MONGODB_HOST:localhost}:${MONGODB_PORT:27017}
dbusername=${MONGODB_USERNAME}
dbpassword=${MONGODB_PASSWORD}
server.contextPath=${SERVER_CONTEXT_PATH:/api}
server.port=${SERVER_PORT:8080}