From f7ed63910ecdfc87f62ace213f36b297a9c57988 Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 11:05:54 +0100 Subject: [PATCH 1/7] Added possibility to change path for WEBAPPS_DIR --- configuration.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.sh b/configuration.sh index 1fdc9e1..7966251 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 ######################## From 19832ac31fbbb8f699ef83c756566f488b650687 Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 11:43:43 +0100 Subject: [PATCH 2/7] Added wider ownership for openshift not running as root --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 323a029..c2161a1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,8 @@ 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 o+w /usr/local/tomcat/webapps /usr/local/tomcat/conf/server.xml COPY startup.sh /startup.sh COPY log4j.stdout.replace /log4j.stdout.replace From 7994fa3c2248bccf181c333f59cdefa5a560da41 Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 12:29:46 +0100 Subject: [PATCH 3/7] Added even wider ownership for openshift not running as root --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index c2161a1..d1096bf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update -qq && \ rm -rf /usr/local/tomcat/webapps && \ mkdir -p /usr/local/tomcat/webapps && \ mkdir /jamfpro-config && \ - chmod o+w /usr/local/tomcat/webapps /usr/local/tomcat/conf/server.xml + chmod -R o+w /usr/local/tomcat/webapps /usr/local/tomcat/conf COPY startup.sh /startup.sh COPY log4j.stdout.replace /log4j.stdout.replace From 215109f2849da8ec9b6bb451a51d18606de45dd8 Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 12:37:26 +0100 Subject: [PATCH 4/7] Added even wider ownership for openshift not running as root --- Dockerfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d1096bf..ef664eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,9 @@ RUN apt-get update -qq && \ rm -rf /usr/local/tomcat/webapps && \ mkdir -p /usr/local/tomcat/webapps && \ mkdir /jamfpro-config && \ - chmod -R o+w /usr/local/tomcat/webapps /usr/local/tomcat/conf + chmod -R o+w /usr/local/tomcat/webapps && \ + chmod go+r /usr/local/tomcat/conf /usr/local/tomcat/conf/server.xml + COPY startup.sh /startup.sh COPY log4j.stdout.replace /log4j.stdout.replace From 7a16ebbf8a766ca448f36377e5f15d2df6ae5f4c Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 12:38:17 +0100 Subject: [PATCH 5/7] Added even wider ownership for openshift not running as root --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ef664eb..3665625 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,7 +11,7 @@ RUN apt-get update -qq && \ mkdir -p /usr/local/tomcat/webapps && \ mkdir /jamfpro-config && \ chmod -R o+w /usr/local/tomcat/webapps && \ - chmod go+r /usr/local/tomcat/conf /usr/local/tomcat/conf/server.xml + chmod go+w /usr/local/tomcat/conf /usr/local/tomcat/conf/server.xml COPY startup.sh /startup.sh From 51511d411827b2303e19665ebc3d2a61f7bcb8cc Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 12:44:57 +0100 Subject: [PATCH 6/7] Added even wider ownership for openshift not running as root --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 3665625..110df22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN apt-get update -qq && \ rm -rf /usr/local/tomcat/webapps && \ mkdir -p /usr/local/tomcat/webapps && \ mkdir /jamfpro-config && \ - chmod -R o+w /usr/local/tomcat/webapps && \ + chmod -R go+w /usr/local/tomcat/webapps && \ chmod go+w /usr/local/tomcat/conf /usr/local/tomcat/conf/server.xml From 317a69c350398c46acfae31f29371a910b39ee42 Mon Sep 17 00:00:00 2001 From: V1Niklas Blomdalen Date: Tue, 19 Mar 2024 12:49:06 +0100 Subject: [PATCH 7/7] Added workaround for PI109681 --- configuration.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/configuration.sh b/configuration.sh index 7966251..74c587e 100755 --- a/configuration.sh +++ b/configuration.sh @@ -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 }