From 073d317c9f5794bcdbb7e5701b5bdfa06cd61364 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 8 Jun 2020 10:55:56 +0200
Subject: [PATCH] Added option to configure jvm parameter of docker image

---
 CHANGELOG.md                                                | 2 ++
 scm-packaging/docker/Dockerfile                             | 3 ++-
 .../docker/src/main/fs/opt/scm-server/bin/scm-server        | 6 ++++++
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100755 scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b9236809f..d929694c5d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Unreleased
+### Added
+- Option to configure jvm parameter of docker container with env JAVA_OPTS or with arguments
 
 ### Fixed
 - Fixes configuration of jetty listener address with system property `jetty.host` ([#1173](https://github.com/scm-manager/scm-manager/pull/1173), [#1174](https://github.com/scm-manager/scm-manager/pull/1174))
diff --git a/scm-packaging/docker/Dockerfile b/scm-packaging/docker/Dockerfile
index ab6dd87916..da0599d9d9 100644
--- a/scm-packaging/docker/Dockerfile
+++ b/scm-packaging/docker/Dockerfile
@@ -47,6 +47,7 @@ RUN set -x \
  && addgroup -S -g 1000 scm \
  && adduser -S -s /bin/false -G scm -h ${SCM_HOME} -D -H -u 1000 scm \
  && mkdir -p ${SCM_HOME} ${CACHE_DIR} \
+ && chmod +x /opt/scm-server/bin/scm-server \
  && chown scm:scm ${SCM_HOME} ${CACHE_DIR}
 
 # copy mercurial installation
@@ -58,4 +59,4 @@ VOLUME ["${SCM_HOME}", "${CACHE_DIR}"]
 EXPOSE 8080
 USER scm
 
-CMD [ "java", "-cp", "/etc/scm:/opt/scm-server/lib/*", "-Djava.awt.headless=true", "-Dlogback.configurationFile=logging.xml", "sonia.scm.server.ScmServerDaemon" ]
+ENTRYPOINT [ "/opt/scm-server/bin/scm-server" ]
diff --git a/scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server b/scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server
new file mode 100755
index 0000000000..82f8a2f74b
--- /dev/null
+++ b/scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server
@@ -0,0 +1,6 @@
+#!/bin/sh
+exec java -cp "/etc/scm:/opt/scm-server/lib/*" \
+  -Djava.awt.headless=true \
+  -Dlogback.configurationFile=logging.xml \
+  $JAVA_OPTS $* \
+  sonia.scm.server.ScmServerDaemon