Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1193 from jbonofre/AMQ-9460 

AMQ-9460: Don't override ACTIVEMQ_OPTS when provided by user
This commit is contained in:
JB Onofré 2024-04-01 07:38:19 +02:00 committed by GitHub
parent a611b143da 34e228f14c
commit 24c00d1a80
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assembly/src/docker/Dockerfile
View File

@ -24,7 +24,7 @@ ENV ACTIVEMQ_HOME $ACTIVEMQ_INSTALL_PATH/apache-activemq
ENV ACTIVEMQ_EXEC exec ENV ACTIVEMQ_EXEC exec
ENV PATH $PATH:$ACTIVEMQ_HOME/bin ENV PATH $PATH:$ACTIVEMQ_HOME/bin
# Make the Web console accesible from outside the container # 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 #WORKDIR $ACTIVEMQ_HOME
# activemq_dist can point to a directory or a tarball on the local system # activemq_dist can point to a directory or a tarball on the local system

7
assembly/src/release/bin/activemq
View File

@ -198,13 +198,6 @@ if [ "$CONFIG_LOAD" != "yes" ];then
echo echo
fi 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 # OS SPECIFIC SUPPORT

4
assembly/src/release/bin/setenv
View File

@ -33,9 +33,7 @@
if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then if [ -z "$ACTIVEMQ_OPTS_MEMORY" ] ; then
ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G" ACTIVEMQ_OPTS_MEMORY="-Xms64M -Xmx1G"
fi fi
if [ -z "$ACTIVEMQ_OPTS" ] ; then ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY $ACTIVEMQ_OPTS -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
ACTIVEMQ_OPTS="$ACTIVEMQ_OPTS_MEMORY -Djava.util.logging.config.file=logging.properties -Djava.security.auth.login.config=$ACTIVEMQ_CONF/login.config"
fi
if [ -z "$ACTIVEMQ_OUT" ]; then if [ -z "$ACTIVEMQ_OUT" ]; then
ACTIVEMQ_OUT="/dev/null" ACTIVEMQ_OUT="/dev/null"