AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user
diff --git a/assembly/src/docker/Dockerfile b/assembly/src/docker/Dockerfile
index 819b64c..596265c 100644
--- a/assembly/src/docker/Dockerfile
+++ b/assembly/src/docker/Dockerfile
@@ -24,7 +24,7 @@
ENV ACTIVEMQ_EXEC exec
ENV PATH $PATH:$ACTIVEMQ_HOME/bin
# Make the Web console accesible from outside the container
-ENV ACTIVEMQ_OPTS $ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
+ENV ACTIVEMQ_OPTS -Djetty.host=0.0.0.0
#WORKDIR $ACTIVEMQ_HOME
# activemq_dist can point to a directory or a tarball on the local system
diff --git a/assembly/src/release/bin/activemq b/assembly/src/release/bin/activemq
index 8a51f40..720cd0e 100755
--- a/assembly/src/release/bin/activemq
+++ b/assembly/src/release/bin/activemq
@@ -198,13 +198,6 @@
echo
fi
-if [ -z "$ACTIVEMQ_OPTS" ] ; then
- ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=\"$ACTIVEMQ_CONF\"/login.config"
-fi
-
-
-
-
# ------------------------------------------------------------------------
# OS SPECIFIC SUPPORT
diff --git a/assembly/src/release/bin/setenv b/assembly/src/release/bin/setenv
index 87c2624..17e927f 100644
--- a/assembly/src/release/bin/setenv
+++ b/assembly/src/release/bin/setenv
@@ -33,9 +33,7 @@
if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
fi
-if [ -z "$ACTIVEMQ_OPTS" ] ; then
- ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
-fi
+ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY $ACTIVEMQ_OPTS -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
if [ -z "$ACTIVEMQ_OUT" ]; then
ACTIVEMQ_OUT="/dev/null"
