From 0bb3a0417f1cb45e7ad436799fafdc2c493790e1 Mon Sep 17 00:00:00 2001
From: Fee Gevaert <fee.gevaert@opengeohub.org>
Date: Mon, 12 Jun 2023 16:21:13 +0200
Subject: [PATCH] updated compose according to #1608

Signed-off-by: Fee Gevaert <fee.gevaert@opengeohub.org>
---
 .../docker-compose/insecure/mariadb/apache/docker-compose.yml | 4 ++++
 .examples/docker-compose/insecure/mariadb/apache/redis.env    | 1 +
 .../docker-compose/insecure/mariadb/fpm/docker-compose.yml    | 4 ++++
 .examples/docker-compose/insecure/mariadb/fpm/redis.env       | 1 +
 .../insecure/postgres/apache/docker-compose.yml               | 4 ++++
 .examples/docker-compose/insecure/postgres/apache/redis.env   | 1 +
 .../docker-compose/insecure/postgres/fpm/docker-compose.yml   | 4 ++++
 .examples/docker-compose/insecure/postgres/fpm/redis.env      | 1 +
 .../with-nginx-proxy/mariadb/apache/docker-compose.yml        | 4 ++++
 .../docker-compose/with-nginx-proxy/mariadb/apache/redis.env  | 1 +
 .../with-nginx-proxy/mariadb/fpm/docker-compose.yml           | 4 ++++
 .../docker-compose/with-nginx-proxy/mariadb/fpm/redis.env     | 1 +
 .../with-nginx-proxy/postgres/apache/docker-compose.yml       | 4 ++++
 .../docker-compose/with-nginx-proxy/postgres/apache/redis.env | 1 +
 .../with-nginx-proxy/postgres/fpm/docker-compose.yml          | 4 ++++
 .../docker-compose/with-nginx-proxy/postgres/fpm/redis.env    | 1 +
 16 files changed, 40 insertions(+)
 create mode 100644 .examples/docker-compose/insecure/mariadb/apache/redis.env
 create mode 100644 .examples/docker-compose/insecure/mariadb/fpm/redis.env
 create mode 100644 .examples/docker-compose/insecure/postgres/apache/redis.env
 create mode 100644 .examples/docker-compose/insecure/postgres/fpm/redis.env
 create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
 create mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
 create mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
 create mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env

diff --git a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
index 11ff5bf9..8d47f173 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@@ -17,6 +17,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:apache
@@ -30,6 +33,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/insecure/mariadb/apache/redis.env b/.examples/docker-compose/insecure/mariadb/apache/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/insecure/mariadb/apache/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
index e293a92c..d9c91105 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@@ -17,6 +17,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:fpm-alpine
@@ -28,6 +31,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/redis.env b/.examples/docker-compose/insecure/mariadb/fpm/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/insecure/mariadb/fpm/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
index 0a48bd05..8980d9dc 100644
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@@ -12,6 +12,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:apache
@@ -25,6 +28,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/insecure/postgres/apache/redis.env b/.examples/docker-compose/insecure/postgres/apache/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/insecure/postgres/apache/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
index 97343ad9..70acf303 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@@ -12,6 +12,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:fpm-alpine
@@ -23,6 +26,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/insecure/postgres/fpm/redis.env b/.examples/docker-compose/insecure/postgres/fpm/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/insecure/postgres/fpm/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
index b88a3594..cfa7a553 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@@ -17,6 +17,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:apache
@@ -31,6 +34,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
index 94196e9f..cd9b3f6b 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@@ -17,6 +17,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:fpm-alpine
@@ -28,6 +31,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
index 243e06cf..1850a13d 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@@ -12,6 +12,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:apache
@@ -26,6 +29,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
index 008d74af..4813ae9c 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@@ -12,6 +12,9 @@ services:
   redis:
     image: redis:alpine
     restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env
 
   app:
     image: nextcloud:fpm-alpine
@@ -23,6 +26,7 @@ services:
       - REDIS_HOST=redis
     env_file:
       - db.env
+      - redis.env
     depends_on:
       - db
       - redis
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
new file mode 100644
index 00000000..952b0c5c
--- /dev/null
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
@@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=