From 02aedc754d0ff1e094e7caade8a8ddbea8e4e503 Mon Sep 17 00:00:00 2001
From: Indiphile Ngqambuza <ingqambuza@gmail.com>
Date: Mon, 2 Feb 2026 11:37:14 +0200
Subject: [PATCH 1/2] Add s3 jars

---
 docker-compose.yaml | 58 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 docker-compose.yaml

diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 00000000..435033cb
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,58 @@
+version: '3'
+services:
+  geoserver:
+    build:
+      context: .
+      args:
+        - GS_VERSION=2.28.2
+    ports:
+      - "80:8080"
+    environment:
+      - INSTALL_EXTENSIONS=true
+      - STABLE_EXTENSIONS=wps,csw,gwc-s3
+      - COMMUNITY_EXTENSIONS=cog-s3
+      - EXTRA_JAVA_OPTS=-Xms1G -Xmx2G
+      - CORS_ENABLED=true
+      - CORS_ALLOWED_METHODS=GET,POST,PUT,HEAD,OPTIONS
+      - POSTGRES_JNDI_ENABLED=true
+      - POSTGRES_HOST=postgis
+      - POSTGRES_PORT=5432
+      - POSTGRES_DB=geoserver
+      - POSTGRES_USERNAME=geoserver
+      - POSTGRES_PASSWORD=geoserver
+      - POSTGRES_JNDI_RESOURCE_NAME=jdbc/postgres
+      - RUN_UNPRIVILEGED=true
+      - RUN_WITH_USER_UID=1000 # you may change this to match your host user id
+      - RUN_WITH_USER_GID=1000 # you may change this to match your host group id
+
+      # - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      # - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
+      # - AWS_REGION=${AWS_REGION:-us-east-1}
+      - S3_ALIAS=minio
+      - S3_ENDPOINT=${MINIO_ENDPOINT}
+      - S3_USER=${AWS_ACCESS_KEY_ID}
+      - S3_PASS=${AWS_SECRET_ACCESS_KEY}
+      
+    volumes:
+      - ./geoserver_data:/opt/geoserver_data/:Z
+      - ./additional_libs:/opt/additional_libs:Z # by mounting this we can install libs from host on startup
+      - ./additional_fonts:/opt/additional_fonts:Z
+    healthcheck:
+      test: curl --fail "http://localhost:8080/geoserver/web/wicket/resource/org.geoserver.web.GeoServerBasePage/img/logo.png" || exit 1
+      interval: 1m
+      retries: 3
+      timeout: 20s
+  postgis:
+    image: postgis/postgis:18-3.6-alpine
+    ports:
+      - "5555:5432"
+    environment:
+      POSTGRES_USER: geoserver
+      POSTGRES_PASSWORD: geoserver
+    volumes:
+      - ./postgis/postgresql_data:/var/lib/postgresql:Z
+    healthcheck:
+      test: pg_isready -U geoserver -h localhost -t 5 || exit 1
+      interval: 10s
+      retries: 5
+      timeout: 10s

From d52dc02f0bb1f87d22ed432008c75b464303fd7a Mon Sep 17 00:00:00 2001
From: Indiphile <ingqambuza@mngmt1.cm.cluster>
Date: Thu, 12 Feb 2026 17:12:13 +0200
Subject: [PATCH 2/2] aws-connection

---
 additional_libs/.gitignore | 0
 docker-compose.yaml        | 2 +-
 geoserver_data/.gitignore  | 0
 3 files changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 additional_libs/.gitignore
 mode change 100644 => 100755 geoserver_data/.gitignore

diff --git a/additional_libs/.gitignore b/additional_libs/.gitignore
old mode 100644
new mode 100755
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 435033cb..9a35e3d0 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -6,7 +6,7 @@ services:
       args:
         - GS_VERSION=2.28.2
     ports:
-      - "80:8080"
+      - "8084:8080"
     environment:
       - INSTALL_EXTENSIONS=true
       - STABLE_EXTENSIONS=wps,csw,gwc-s3
diff --git a/geoserver_data/.gitignore b/geoserver_data/.gitignore
old mode 100644
new mode 100755