update permissions

build_data/broker.xml

@@ -8,10 +8,6 @@
   <bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer"/>
   <broker useJmx="true" xmlns="http://activemq.apache.org/schema/core">
 
-    <amq:persistenceAdapter>
-      <kahaDB directory="${activemq.base}/kahadb" lockKeepAlivePeriod="0" />
-    </amq:persistenceAdapter>
-
     <amq:persistenceAdapter>
       <jdbcPersistenceAdapter dataDirectory="activemq-data"
         dataSource="#postgres-ds" lockKeepAlivePeriod="0"/>

clustering/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.9'
 
 volumes:
    geoserver-cluster-data:
+   geoserver-cluster-gwc-data:
    geo-db-data:
 
 services:
@@ -22,9 +23,11 @@ services:
       image: kartoza/geoserver:2.24.1
       volumes:
          - geoserver-cluster-data:/opt/geoserver/data_dir
+         - geoserver-cluster-gwc-data:/opt/geoserver/gwc
       ports:
         - "8081:8080"
       environment:
+        - GEOWEBCACHE_CACHE_DIR=/opt/geoserver/gwc
         - BROKER_URL=tcp://0.0.0.0:61661
         - READONLY=disabled
         - CLUSTER_DURABILITY=false
@@ -53,9 +56,11 @@ services:
       image: kartoza/geoserver:2.24.1
       volumes:
          - geoserver-cluster-data:/opt/geoserver/data_dir
+         - geoserver-cluster-gwc-data:/opt/geoserver/gwc
       ports:
         - "8082:8080"
       environment:
+        - GEOWEBCACHE_CACHE_DIR=/opt/geoserver/gwc
         - BROKER_URL=tcp://master:61661
         - READONLY=disabled
         - CLUSTER_DURABILITY=false

scripts/entrypoint.sh

@@ -108,6 +108,8 @@ if [[ ${RUN_AS_ROOT} =~ [Ff][Aa][Ll][Ss][Ee] ]];then
       chown -R "${USER_NAME}":"${GEO_GROUP_NAME}" "${directory}"
     fi
   done
+  chown -R "${USER_NAME}":"${GEO_GROUP_NAME}" "${CLUSTER_CONFIG_DIR}"
+  chown -R "${USER_NAME}":"${GEO_GROUP_NAME}" "${GEOSERVER_DATA_DIR}"/logging.xml
 fi
 
 chmod o+rw "${CERT_DIR}";gwc_file_perms ;chmod 400 "${CATALINA_HOME}"/conf/*

scripts/functions.sh

@@ -238,7 +238,7 @@ function cluster_config() {
       envsubst < /build_data/cluster.properties > "${CLUSTER_CONFIG_DIR}"/cluster.properties
     fi
   fi
-  chown -R "${USER_NAME}":"${GEO_GROUP_NAME}" "${GEOSERVER_DATA_DIR}"/cluster
+  chown -R "${USER_NAME}":"${GEO_GROUP_NAME}" "${CLUSTER_CONFIG_DIR}"
 }
 
 # Helper function to setup broker config. Used with clustering configs
@@ -390,6 +390,7 @@ function geoserver_logging() {
     if [[ ${CLUSTERING} =~ [Tt][Rr][Uu][Ee] ]]; then
         export LOG_PATH=${CLUSTER_CONFIG_DIR}/geoserver.log
       else
+        create_dir "${GEOSERVER_DATA_DIR}"/logs
         export LOG_PATH=${GEOSERVER_DATA_DIR}/logs/geoserver.log
     fi
 
@@ -401,6 +402,7 @@ function geoserver_logging() {
 </logging>
 " > "${GEOSERVER_DATA_DIR}"/logging.xml
 
+
   if [[ ! -f ${LOG_PATH} ]];then
     touch "${LOG_PATH}"
   fi
@@ -472,7 +474,7 @@ function postgres_ready_status() {
   PORT="$2"
   USER="$3"
   DB="$4"
-  until psql -h "$HOST" -p "$PORT" -U "$USER" -d "$DB"  -c '\l'; do
+  until psql -h "$HOST" -p "$PORT" -U "$USER" -d "$DB"  -c '\dt public.spatial_ref_sys' >/dev/null 2>&1; do
   >&2 echo "Postgres is unavailable - sleeping"
   sleep 1
 done

scripts/start.sh

@@ -233,10 +233,11 @@ export REQUEST_TIMEOUT PARALLEL_REQUEST GETMAP REQUEST_EXCEL SINGLE_USER GWC_REQ
 # Setup control flow properties
 setup_control_flow
 
-create_dir "${GEOSERVER_DATA_DIR}"/logs
+
 export GEOSERVER_LOG_LEVEL
 geoserver_logging
 
+
 if [[ ${POSTGRES_JNDI} =~ [Tt][Rr][Uu][Ee] ]];then
   postgres_ssl_setup
   export SSL_PARAMETERS=${PARAMS}