You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2019/01/31 14:13:18 UTC
james-project git commit: JAMES-2622 Introduce env variable for java
options in dockerfiles
Repository: james-project
Updated Branches:
refs/heads/master a4d524d86 -> e745d958b
JAMES-2622 Introduce env variable for java options in dockerfiles
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/e745d958
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/e745d958
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/e745d958
Branch: refs/heads/master
Commit: e745d958bf84537224f3eb16ce9e407cfa614aeb
Parents: a4d524d
Author: Antoine Duprat <ad...@linagora.com>
Authored: Thu Dec 6 15:45:31 2018 +0100
Committer: Matthieu Baechler <ma...@apache.org>
Committed: Thu Jan 31 15:12:25 2019 +0100
----------------------------------------------------------------------
README.adoc | 5 +++++
dockerfiles/run/guice/cassandra-ldap/Dockerfile | 3 ++-
dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile | 3 ++-
dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile | 3 ++-
dockerfiles/run/guice/cassandra/Dockerfile | 3 ++-
dockerfiles/run/guice/jpa-smtp/Dockerfile | 3 ++-
dockerfiles/run/guice/jpa/Dockerfile | 3 ++-
7 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/README.adoc
----------------------------------------------------------------------
diff --git a/README.adoc b/README.adoc
index 23c5b10..7a27e28 100644
--- a/README.adoc
+++ b/README.adoc
@@ -258,6 +258,11 @@ Where :
You can add an optional port binding to port 8000, to expose the webadmin server. Please note that users are not authenticated on webadmin server, thus you should avoid exposing it in production.
+If you want to pass additional options to the underlying java command, you can configure a _JVM_OPTIONS_ env variable, for example add:
+
+ --env JVM_OPTIONS="-Xms256m -Xmx2048m"
+
+
To have log file accessible on a volume, add *-v $PWD/logs:/logs* option to the above command line, where *$PWD/logs* is your local directory to put files in.
==== Handling attachment indexing
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/cassandra-ldap/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
index 4197539..b06597b 100644
--- a/dockerfiles/run/guice/cassandra-ldap/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-ldap/Dockerfile
@@ -28,4 +28,5 @@ ADD destination/conf /root/conf
VOLUME /logs
VOLUME /root/conf
-ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS -jar james-server.jar
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
index 1056388..e7e9692 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-rabbitmq-ldap/Dockerfile
@@ -28,4 +28,5 @@ ADD destination/conf /root/conf
VOLUME /logs
VOLUME /root/conf
-ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS -jar james-server.jar
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile b/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
index e2f4083..f9f2919 100644
--- a/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
+++ b/dockerfiles/run/guice/cassandra-rabbitmq/Dockerfile
@@ -28,4 +28,5 @@ ADD destination/conf /root/conf
VOLUME /logs
VOLUME /root/conf
-ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS -jar james-server.jar
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/cassandra/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/cassandra/Dockerfile b/dockerfiles/run/guice/cassandra/Dockerfile
index c6433db..c17430e 100644
--- a/dockerfiles/run/guice/cassandra/Dockerfile
+++ b/dockerfiles/run/guice/cassandra/Dockerfile
@@ -28,4 +28,5 @@ ADD destination/conf /root/conf
VOLUME /logs
VOLUME /root/conf
-ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ -jar james-server.jar
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS -jar james-server.jar
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/jpa-smtp/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa-smtp/Dockerfile b/dockerfiles/run/guice/jpa-smtp/Dockerfile
index fd1bb64..0335a81 100644
--- a/dockerfiles/run/guice/jpa-smtp/Dockerfile
+++ b/dockerfiles/run/guice/jpa-smtp/Dockerfile
@@ -25,4 +25,5 @@ ADD destination/conf /root/conf
VOLUME /logs
-ENTRYPOINT java -classpath '/root/james-server-jpa-smtp-guice.jar:/root/james-server-jpa-smtp-guice.lib/*' -javaagent:/root/james-server-jpa-smtp-guice.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -classpath '/root/james-server-jpa-smtp-guice.jar:/root/james-server-jpa-smtp-guice.lib/*' -javaagent:/root/james-server-jpa-smtp-guice.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS org.apache.james.JPAJamesServerMain
http://git-wip-us.apache.org/repos/asf/james-project/blob/e745d958/dockerfiles/run/guice/jpa/Dockerfile
----------------------------------------------------------------------
diff --git a/dockerfiles/run/guice/jpa/Dockerfile b/dockerfiles/run/guice/jpa/Dockerfile
index 036562a..8f641cf 100644
--- a/dockerfiles/run/guice/jpa/Dockerfile
+++ b/dockerfiles/run/guice/jpa/Dockerfile
@@ -27,4 +27,5 @@ ADD destination/conf /root/conf
VOLUME /logs
-ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-jpa-guice.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ org.apache.james.JPAJamesServerMain
+ENV JVM_OPTIONS=""
+ENTRYPOINT java -classpath '/root/james-server.jar:/root/james-server-jpa-guice.lib/*' -javaagent:/root/james-server-jpa-guice.lib/openjpa-3.0.0.jar -Dlogback.configurationFile=/root/conf/logback.xml -Dworking.directory=/root/ $JVM_OPTIONS org.apache.james.JPAJamesServerMain
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org