From 9721ad0bcd05a54957c6f2e3215e4456022fec96 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Wed, 12 Oct 2022 18:29:44 +0200 Subject: [PATCH 1/3] Add optional EXTRA_JAVA_OPTIONS environment variable Signed-off-by: Valentijn Scholten --- src/main/docker/Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile index 009fb43df5..a48e14d335 100644 --- a/src/main/docker/Dockerfile +++ b/src/main/docker/Dockerfile @@ -15,8 +15,10 @@ ARG WAR_FILENAME=dependency-track-apiserver.jar ENV TZ=Etc/UTC \ # Dependency-Track's default logging level LOGGING_LEVEL=INFO \ - # Environment variables that can be passed at runtime + # JVM Options that are passed at runtime by default JAVA_OPTIONS="-XX:+UseParallelGC -XX:MaxRAMPercentage=90.0" \ + # JVM Options that can be passed at runtime, while maintaining also those set in JAVA_OPTIONS + EXTRA_JAVA_OPTIONS="" \ # The web context defaults to the root. To override, supply an alternative context which starts with a / but does not end with one # Example: /dtrack CONTEXT="/" \ @@ -59,7 +61,7 @@ USER ${UID} WORKDIR ${APP_DIR} # Launch Dependency-Track -CMD java ${JAVA_OPTIONS} --add-opens java.base/java.util.concurrent=ALL-UNNAMED -DdependencyTrack.logging.level=${LOGGING_LEVEL} -jar ${WAR_FILENAME} -context ${CONTEXT} +CMD java ${JAVA_OPTIONS} ${EXTRA_JAVA_OPTIONS} --add-opens java.base/java.util.concurrent=ALL-UNNAMED -DdependencyTrack.logging.level=${LOGGING_LEVEL} -jar ${WAR_FILENAME} -context ${CONTEXT} # Specify which port Dependency-Track listens on EXPOSE 8080 From 2630d94250dcbf2800396b0f41846a795a29a0ce Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Wed, 12 Oct 2022 18:36:31 +0200 Subject: [PATCH 2/3] Add optional EXTRA_JAVA_OPTIONS environment variable Signed-off-by: Valentijn Scholten --- docs/_docs/getting-started/deploy-docker.md | 8 ++++++-- src/main/docker/docker-compose.yml | 8 +++++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/docs/_docs/getting-started/deploy-docker.md b/docs/_docs/getting-started/deploy-docker.md index 8748b879f8..67945ae3fd 100755 --- a/docs/_docs/getting-started/deploy-docker.md +++ b/docs/_docs/getting-started/deploy-docker.md @@ -150,10 +150,14 @@ services: # - ALPINE_METRICS_ENABLED=true # - ALPINE_METRICS_AUTH_USERNAME= # - ALPINE_METRICS_AUTH_PASSWORD= - # + # # Optional environmental variables to enable default notification publisher templates override and set the base directory to search for templates # - DEFAULT_TEMPLATES_OVERRIDE_ENABLED=false # - DEFAULT_TEMPLATES_OVERRIDE_BASE_DIRECTORY=/data + # + # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8 + # - EXTRA_JAVA_OPTIONS= + deploy: resources: limits: @@ -166,7 +170,7 @@ services: - '8081:8080' volumes: # Optional volume mount to override default notification publisher templates - # - "/host/path/to/template/base/dir:/data/templates" + # - "/host/path/to/template/base/dir:/data/templates" - 'dependency-track:/data' restart: unless-stopped diff --git a/src/main/docker/docker-compose.yml b/src/main/docker/docker-compose.yml index 0d2351a117..f56a66f749 100644 --- a/src/main/docker/docker-compose.yml +++ b/src/main/docker/docker-compose.yml @@ -81,6 +81,13 @@ services: # - ALPINE_METRICS_ENABLED=true # - ALPINE_METRICS_AUTH_USERNAME= # - ALPINE_METRICS_AUTH_PASSWORD= + # + # Optional environmental variables to enable default notification publisher templates override and set the base directory to search for templates + # - DEFAULT_TEMPLATES_OVERRIDE_ENABLED=false + # - DEFAULT_TEMPLATES_OVERRIDE_BASE_DIRECTORY=/data + # + # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8 + # - EXTRA_JAVA_OPTIONS= deploy: resources: limits: @@ -116,4 +123,3 @@ services: ports: - "8080:8080" restart: unless-stopped - From b798f1dcfe644486392f287f28398eb1546aa632 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Wed, 12 Oct 2022 19:15:04 +0200 Subject: [PATCH 3/3] typos Signed-off-by: Valentijn Scholten --- docs/_docs/getting-started/deploy-docker.md | 2 +- src/main/docker/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/_docs/getting-started/deploy-docker.md b/docs/_docs/getting-started/deploy-docker.md index 67945ae3fd..1c51111353 100755 --- a/docs/_docs/getting-started/deploy-docker.md +++ b/docs/_docs/getting-started/deploy-docker.md @@ -155,7 +155,7 @@ services: # - DEFAULT_TEMPLATES_OVERRIDE_ENABLED=false # - DEFAULT_TEMPLATES_OVERRIDE_BASE_DIRECTORY=/data # - # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8 + # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8" # - EXTRA_JAVA_OPTIONS= deploy: diff --git a/src/main/docker/docker-compose.yml b/src/main/docker/docker-compose.yml index f56a66f749..b060d4374d 100644 --- a/src/main/docker/docker-compose.yml +++ b/src/main/docker/docker-compose.yml @@ -86,7 +86,7 @@ services: # - DEFAULT_TEMPLATES_OVERRIDE_ENABLED=false # - DEFAULT_TEMPLATES_OVERRIDE_BASE_DIRECTORY=/data # - # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8 + # Optional environmental variables to provide more JVM arguments to the API Server JVM, i.e. "-XX:ActiveProcessorCount=8" # - EXTRA_JAVA_OPTIONS= deploy: resources: