From 2de379ccb9e16c729b84c0303816dc1105661fdb Mon Sep 17 00:00:00 2001 From: Jean Aurambault Date: Fri, 31 Jul 2020 10:35:49 -0700 Subject: [PATCH] Add JAVA_OPTS in docker image --- docker/docker-compose.yml | 1 + webapp/src/main/docker/Dockerfile | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 72447d52b2..ec76e36362 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -25,6 +25,7 @@ services: - "8080:8080" restart: always environment: +# JAVA_OPTS: '-Xms2g' SPRING_APPLICATION_JSON: '{ "spring.flyway.enabled": "true", "l10n.flyway.clean" : "false", diff --git a/webapp/src/main/docker/Dockerfile b/webapp/src/main/docker/Dockerfile index 7d4068b9bd..46c547fbb6 100644 --- a/webapp/src/main/docker/Dockerfile +++ b/webapp/src/main/docker/Dockerfile @@ -2,6 +2,5 @@ FROM openjdk:8-alpine VOLUME /tmp ADD mojito-webapp-*-exec.jar app.jar RUN sh -c 'touch /app.jar' -ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom","-jar","/app.jar"] - - +# starting with "exec doesn't seem to be needed with openjdk:8-alpine. As per docker documentation, it is required in general +ENTRYPOINT exec java $JAVA_OPTS -Djava.security.egd=file:/dev/./urandom -jar /app.jar