diff --git a/Dockerfile b/Dockerfile index 323a029..110df22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,10 @@ RUN apt-get update -qq && \ adduser --disabled-password --gecos '' tomcat && \ rm -rf /usr/local/tomcat/webapps && \ mkdir -p /usr/local/tomcat/webapps && \ - mkdir /jamfpro-config + mkdir /jamfpro-config && \ + chmod -R go+w /usr/local/tomcat/webapps && \ + chmod go+w /usr/local/tomcat/conf /usr/local/tomcat/conf/server.xml + COPY startup.sh /startup.sh COPY log4j.stdout.replace /log4j.stdout.replace diff --git a/configuration.sh b/configuration.sh index 1fdc9e1..74c587e 100755 --- a/configuration.sh +++ b/configuration.sh @@ -1,6 +1,6 @@ #!/bin/bash -e -WEBAPPS_DIR="/usr/local/tomcat/webapps" +WEBAPPS_DIR=${WEBAPPS_DIR:-"/usr/local/tomcat/webapps"} ########################################################## ####################### Functions ######################## @@ -143,11 +143,13 @@ cache.type=memcached EOF } +# PI109681 create_memcached_properties(){ echo_time "Setting up the memcached.properties" cat <<-EOF > ${WEBAPPS_DIR}/ROOT/WEB-INF/classes/dal/memcached.properties memcached.endpoints[0]=$MEMCACHED_HOST memcached.timeToLiveSeconds=120 +memcached.directory.timeToLiveSeconds=120 EOF }