Skip to content

Commit

Permalink
Fix bug on wrapper to use config file in temp folder
Browse files Browse the repository at this point in the history
  • Loading branch information
disaster37 committed Apr 28, 2015
1 parent 479b5fb commit f6df975
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
FROM webcenter/openjdk-jre:8
MAINTAINER Sebastien LANGOUREAUX <[email protected]>


# Update distro and install some packages
RUN apt-get update && \
apt-get upgrade -y && \
Expand Down
6 changes: 3 additions & 3 deletions assets/init.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@


ACTIVEMQ_HOME = "/opt/activemq"
ACTIVEMQ_CONF = ACTIVEMQ_HOME + '/conf'
ACTIVEMQ_CONF = ACTIVEMQ_HOME + '/conf.tmp'



Expand Down Expand Up @@ -221,7 +221,7 @@ def do_init_activemq():
replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%\/data", "set.default.ACTIVEMQ_DATA=/data/activemq")

# Fix bug #4 "Cannot mount a custom activemq.xml"
replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf", "set.default.ACTIVEMQ_DATA=%ACTIVEMQ_BASE%/conf.tmp")
replace_all(ACTIVEMQ_HOME + "/bin/linux-x86-64/wrapper.conf" ,"set\.default\.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf", "set.default.ACTIVEMQ_CONF=%ACTIVEMQ_BASE%/conf.tmp")

# We replace the log output
replace_all(ACTIVEMQ_CONF + "/log4j.properties", "\$\{activemq\.base\}\/data\/", "/var/log/activemq/")
Expand Down Expand Up @@ -351,7 +351,7 @@ def setting_all():

# First we fix right on volume
os.system("chown -R activemq:activemq /data/activemq")
os.system("chown -R activemq:activemq " + ACTIVEMQ_HOME + "/conf")
os.system("chown -R activemq:activemq " + ACTIVEMQ_CONF)
os.system("chown -R activemq:activemq /var/log/activemq")

# Then we generate on the flow the right setting
Expand Down

0 comments on commit f6df975

Please sign in to comment.