AMQ-9812: Allow user to set ACTIVEMQ_OPTS and ACTIVEMQ_OPTS_MEMORY env variables in Docker image (#1664)

Author: jbonofre

assembly/src/docker/Dockerfile

@@ -22,11 +22,8 @@ FROM eclipse-temurin:17-jre
 ENV ACTIVEMQ_INSTALL_PATH /opt
 ENV ACTIVEMQ_HOME $ACTIVEMQ_INSTALL_PATH/apache-activemq
 ENV ACTIVEMQ_CONF $ACTIVEMQ_HOME/conf
-ENV ACTIVEMQ_OPTS_MEMORY -Xms64M -Xmx1G
 ENV ACTIVEMQ_EXEC exec
 ENV PATH $PATH:$ACTIVEMQ_HOME/bin
-# Make the Web console accesible from outside the container
-ENV ACTIVEMQ_OPTS $ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config -Djetty.host=0.0.0.0
 #WORKDIR $ACTIVEMQ_HOME
 
 # activemq_dist can point to a directory or a tarball on the local system

assembly/src/docker/entrypoint.sh

@@ -78,4 +78,15 @@ if [ -n "${ACTIVEMQ_WEB_USER}" ]; then
   fi
 fi
 
+if [ -z "${ACTIVEMQ_OPTS_MEMORY}" ]; then
+  ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
+  export ACTIVEMQ_OPTS_MEMORY
+fi
+
+if [ -z "${ACTIVEMQ_OPTS}" ]; then
+  # Make the Web console accesible from outside the container if not already set
+  ACTIVEMQ_OPTS="${ACTIVEMQ_OPTS_MEMORY} -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=${ACTIVEMQ_CONF}/login.config -Djetty.host=0.0.0.0"
+  export ACTIVEMQ_OPTS
+fi
+
 exec "$@"