From 57de78152288598b4ad6d2c86adde91ea897dcba Mon Sep 17 00:00:00 2001
From: Gabriel Roldan <gabriel.roldan@camptocamp.com>
Date: Sat, 2 Nov 2024 14:09:06 -0300
Subject: [PATCH] Fix commit 22c729ba, :z shall be put in the service volume
 mount point

---
 compose/catalog-datadir.yml                     | 16 ++++++++--------
 compose/compose.yml                             |  4 ++--
 .../docker-compose/stable/datadir/compose.yml   | 17 ++++++++---------
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/compose/catalog-datadir.yml b/compose/catalog-datadir.yml
index 7c0e5e8d7..3c9e553d8 100644
--- a/compose/catalog-datadir.yml
+++ b/compose/catalog-datadir.yml
@@ -11,7 +11,7 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: $PWD/catalog-datadir:z
+      device: $PWD/catalog-datadir
   
 services:
   init-datadir:
@@ -28,7 +28,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   wms:
     environment:
@@ -37,7 +37,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   wcs:
     environment:
@@ -46,7 +46,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   wps:
     environment:
@@ -55,7 +55,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   rest:
     environment:
@@ -64,7 +64,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   webui:
     environment:
@@ -73,7 +73,7 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
 
   gwc:
     environment:
@@ -82,4 +82,4 @@ services:
       init-datadir:
         condition: service_completed_successfully
     volumes:
-      - datadir:/opt/app/data_directory
+      - datadir:/opt/app/data_directory:z
diff --git a/compose/compose.yml b/compose/compose.yml
index ebad5a758..1853d9ea5 100644
--- a/compose/compose.yml
+++ b/compose/compose.yml
@@ -7,7 +7,7 @@ volumes:
     driver_opts:
       type: none
       o: bind
-      device: $PWD/../config:z
+      device: $PWD/../config
     driver: local
 
 x-gs-dependencies: &gs-dependencies
@@ -70,7 +70,7 @@ services:
   #  restart: unless-stopped
     volumes:
       # override with the local copy to test config changes during development
-      - config:/etc/geoserver
+      - config:/etc/geoserver:ro
     ports:
       # not needed in production, exposed for local development
       - 8888:8080
diff --git a/docs/deploy/docker-compose/stable/datadir/compose.yml b/docs/deploy/docker-compose/stable/datadir/compose.yml
index d64d966fd..f9aaea9fd 100644
--- a/docs/deploy/docker-compose/stable/datadir/compose.yml
+++ b/docs/deploy/docker-compose/stable/datadir/compose.yml
@@ -1,13 +1,12 @@
 volumes:
-  # a volume to host the shared data directory. Mount it at /opt/app/data_directory, since
-  # /opt/app is owned by the user geo:geo (603:603) in the containers. Otherwise it'd be owned by root
+  # a volume to host the shared data directory. Mount it at /opt/app/data_directory,
   # uncomment the driver_opts entry to bind mount an existing datadirectory and set the device: <path>
   # accordingly to the location of the data directory in the host
   shared_data_directory:
     #driver_opts:
       #type: none
       #o: bind
-      #device: $PWD/datadir:z
+      #device: $PWD/datadir
   rabbitmq_data: # volume for rabbitmq data, so it doesn't create an anonymous one on each container
   geowebcache_data: # used by gwc and web-ui to locate the default gwc tile cache directory
         
@@ -89,7 +88,7 @@ services:
       SPRING_PROFILES_ACTIVE: "datadir"
       GEOSERVER_DATA_DIR: /opt/app/data_directory
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
     deploy:
       resources:
         limits:
@@ -107,7 +106,7 @@ services:
       GEOSERVER_DATA_DIR: /opt/app/data_directory
       GEOWEBCACHE_CACHE_DIR: /data/geowebcache
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
       - geowebcache_data:/data/geowebcache
     deploy:
       resources:
@@ -125,7 +124,7 @@ services:
       SPRING_PROFILES_ACTIVE: "datadir"
       GEOSERVER_DATA_DIR: /opt/app/data_directory
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
     deploy:
       resources:
         limits:
@@ -142,7 +141,7 @@ services:
       SPRING_PROFILES_ACTIVE: "datadir"
       GEOSERVER_DATA_DIR: /opt/app/data_directory
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
     deploy:
       mode: replicated
       replicas: 1
@@ -162,7 +161,7 @@ services:
       GEOSERVER_DATA_DIR: /opt/app/data_directory
       GEOWEBCACHE_CACHE_DIR: /data/geowebcache
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
       - geowebcache_data:/data/geowebcache
     deploy:
       resources:
@@ -179,7 +178,7 @@ services:
       GEOSERVER_DATA_DIR: /opt/app/data_directory
       GEOWEBCACHE_CACHE_DIR: /data/geowebcache
     volumes:
-      - shared_data_directory:/opt/app/data_directory
+      - shared_data_directory:/opt/app/data_directory:z
       - geowebcache_data:/data/geowebcache
     deploy:
       resources: