diff --git a/Dockerfile.build b/Dockerfile.build index 33638b01..0a6a324c 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -18,7 +18,7 @@ FROM openjdk:8-jre VOLUME ["/hygieia/logs"] -RUN mkdir /hygieia/config +RUN mkdir -p /hygieia/config EXPOSE 8080 @@ -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 \ No newline at end of file + java -Djava.security.egd=file:/dev/./urandom -jar *.jar --spring.config.location=$PROP_FILE diff --git a/pom.xml b/pom.xml index f312165f..3965c4cd 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,7 @@ 0.13 4.3.0 - 0.8.3 + 0.8.6 0.200 300 1.8 diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 7c81c605..a1c49348 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -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}