mirror of
https://github.com/scm-manager/scm-manager.git
synced 2026-01-04 06:39:48 +01:00
Added option to configure jvm parameter of docker image
This commit is contained in:
@@ -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))
|
||||
|
||||
@@ -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" ]
|
||||
|
||||
6
scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server
Executable file
6
scm-packaging/docker/src/main/fs/opt/scm-server/bin/scm-server
Executable file
@@ -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
|
||||
Reference in New Issue
Block a user