From a16b4f71ccc1949b7e9191a5b389436de45b0424 Mon Sep 17 00:00:00 2001
From: Melvin mngmt-02 <melvin@suter.dev>
Date: Fri, 13 Oct 2023 16:14:17 +0200
Subject: [PATCH 1/5] making NEXTCLOUD_TRUSTED_DOMAINS after install

Signed-off-by: Melvin mngmt-02 <melvin@suter.dev>
Signed-off-by: Melvin Suter <github@suter.dev>
---
 25/apache/config/trusteddomains.config.php     | 7 +++++++
 25/fpm-alpine/config/trusteddomains.config.php | 7 +++++++
 25/fpm/config/trusteddomains.config.php        | 7 +++++++
 26/apache/config/trusteddomains.config.php     | 7 +++++++
 26/fpm-alpine/config/trusteddomains.config.php | 7 +++++++
 26/fpm/config/trusteddomains.config.php        | 7 +++++++
 27/apache/config/trusteddomains.config.php     | 7 +++++++
 27/fpm-alpine/config/trusteddomains.config.php | 7 +++++++
 27/fpm/config/trusteddomains.config.php        | 7 +++++++
 9 files changed, 63 insertions(+)
 create mode 100644 25/apache/config/trusteddomains.config.php
 create mode 100644 25/fpm-alpine/config/trusteddomains.config.php
 create mode 100644 25/fpm/config/trusteddomains.config.php
 create mode 100644 26/apache/config/trusteddomains.config.php
 create mode 100644 26/fpm-alpine/config/trusteddomains.config.php
 create mode 100644 26/fpm/config/trusteddomains.config.php
 create mode 100644 27/apache/config/trusteddomains.config.php
 create mode 100644 27/fpm-alpine/config/trusteddomains.config.php
 create mode 100644 27/fpm/config/trusteddomains.config.php

diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/25/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/26/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/apache/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/fpm-alpine/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}
diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php
new file mode 100644
index 00000000..32019f32
--- /dev/null
+++ b/27/fpm/config/trusteddomains.config.php
@@ -0,0 +1,7 @@
+<?php
+
+if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  $CONFIG = array(
+    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+  );
+}

From d13714b973222e5a1973dd801f1cb573048b9237 Mon Sep 17 00:00:00 2001
From: Melvin mngmt-02 <melvin@suter.dev>
Date: Fri, 13 Oct 2023 16:34:25 +0200
Subject: [PATCH 2/5] backwards compatibility

Signed-off-by: Melvin mngmt-02 <melvin@suter.dev>
Signed-off-by: Melvin Suter <github@suter.dev>
---
 25/apache/config/trusteddomains.config.php     | 6 +++++-
 25/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 25/fpm/config/trusteddomains.config.php        | 6 +++++-
 26/apache/config/trusteddomains.config.php     | 6 +++++-
 26/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 26/fpm/config/trusteddomains.config.php        | 6 +++++-
 27/apache/config/trusteddomains.config.php     | 6 +++++-
 27/fpm-alpine/config/trusteddomains.config.php | 6 +++++-
 27/fpm/config/trusteddomains.config.php        | 6 +++++-
 9 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/25/apache/config/trusteddomains.config.php b/25/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/apache/config/trusteddomains.config.php
+++ b/25/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/fpm-alpine/config/trusteddomains.config.php
+++ b/25/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/25/fpm/config/trusteddomains.config.php
+++ b/25/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/apache/config/trusteddomains.config.php
+++ b/26/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/fpm-alpine/config/trusteddomains.config.php
+++ b/26/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/26/fpm/config/trusteddomains.config.php
+++ b/26/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/apache/config/trusteddomains.config.php
+++ b/27/apache/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/fpm-alpine/config/trusteddomains.config.php
+++ b/27/fpm-alpine/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }
diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php
index 32019f32..5994628b 100644
--- a/27/fpm/config/trusteddomains.config.php
+++ b/27/fpm/config/trusteddomains.config.php
@@ -1,7 +1,11 @@
 <?php
 
 if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
+  // Get originaly configured values
+  include(__DIR__.'/config.php');
+
+  // Add environment variables
   $CONFIG = array(
-    'trusted_domains' => array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS')))
+    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
   );
 }

From 5a8fe00c14120f7a4b6f4fdfb4f404cd132d9f1c Mon Sep 17 00:00:00 2001
From: Melvin Suter <github@suter.dev>
Date: Mon, 16 Oct 2023 11:15:40 +0200
Subject: [PATCH 3/5] Moving Config file to right dir

Signed-off-by: Melvin Suter <github@suter.dev>
---
 .../config => .config}/trusteddomains.config.php      |  0
 25/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 25/fpm/config/trusteddomains.config.php               | 11 -----------
 26/apache/config/trusteddomains.config.php            | 11 -----------
 26/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 26/fpm/config/trusteddomains.config.php               | 11 -----------
 27/apache/config/trusteddomains.config.php            | 11 -----------
 27/fpm-alpine/config/trusteddomains.config.php        | 11 -----------
 27/fpm/config/trusteddomains.config.php               | 11 -----------
 9 files changed, 88 deletions(-)
 rename {25/apache/config => .config}/trusteddomains.config.php (100%)
 delete mode 100644 25/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 25/fpm/config/trusteddomains.config.php
 delete mode 100644 26/apache/config/trusteddomains.config.php
 delete mode 100644 26/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 26/fpm/config/trusteddomains.config.php
 delete mode 100644 27/apache/config/trusteddomains.config.php
 delete mode 100644 27/fpm-alpine/config/trusteddomains.config.php
 delete mode 100644 27/fpm/config/trusteddomains.config.php

diff --git a/25/apache/config/trusteddomains.config.php b/.config/trusteddomains.config.php
similarity index 100%
rename from 25/apache/config/trusteddomains.config.php
rename to .config/trusteddomains.config.php
diff --git a/25/fpm-alpine/config/trusteddomains.config.php b/25/fpm-alpine/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/25/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/25/fpm/config/trusteddomains.config.php b/25/fpm/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/25/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/26/apache/config/trusteddomains.config.php b/26/apache/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/26/apache/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/26/fpm-alpine/config/trusteddomains.config.php b/26/fpm-alpine/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/26/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/26/fpm/config/trusteddomains.config.php b/26/fpm/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/26/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/27/apache/config/trusteddomains.config.php b/27/apache/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/27/apache/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/27/fpm-alpine/config/trusteddomains.config.php b/27/fpm-alpine/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/27/fpm-alpine/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}
diff --git a/27/fpm/config/trusteddomains.config.php b/27/fpm/config/trusteddomains.config.php
deleted file mode 100644
index 5994628b..00000000
--- a/27/fpm/config/trusteddomains.config.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-if (getenv('NEXTCLOUD_TRUSTED_DOMAINS')) {
-  // Get originaly configured values
-  include(__DIR__.'/config.php');
-
-  // Add environment variables
-  $CONFIG = array(
-    'trusted_domains' => array_merge($CONFIG['trusted_domains'],array_map(function($domain){return trim($domain);},explode(",",getenv('NEXTCLOUD_TRUSTED_DOMAINS'))))
-  );
-}

From 645f515e295c4a7b505c44bc9622d6b158a7b526 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Fri, 18 Apr 2025 15:01:40 +0000
Subject: [PATCH 4/5] Restore PHP 8.3 (#2422)

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
---
 30/apache/Dockerfile     |  2 +-
 30/fpm-alpine/Dockerfile |  2 +-
 30/fpm/Dockerfile        |  2 +-
 31/apache/Dockerfile     |  2 +-
 31/fpm-alpine/Dockerfile |  2 +-
 31/fpm/Dockerfile        |  2 +-
 update.sh                |  3 ++-
 versions.json            | 12 ++++++------
 8 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 7b3f2939..31d62217 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bookworm
+FROM php:8.3-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 26c5c856..09e10d33 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.21
+FROM php:8.3-fpm-alpine3.21
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 6ef1a6a7..8cbb07d3 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bookworm
+FROM php:8.3-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/apache/Dockerfile b/31/apache/Dockerfile
index 642be03e..6421c7b0 100644
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-apache-bookworm
+FROM php:8.3-apache-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/fpm-alpine/Dockerfile b/31/fpm-alpine/Dockerfile
index 0c9ff741..a20a12e8 100644
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.21
+FROM php:8.3-fpm-alpine3.21
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/31/fpm/Dockerfile b/31/fpm/Dockerfile
index 9eee6cfc..92f3935c 100644
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.2-fpm-bookworm
+FROM php:8.3-fpm-bookworm
 
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
diff --git a/update.sh b/update.sh
index de9670b3..3128e4a3 100755
--- a/update.sh
+++ b/update.sh
@@ -10,7 +10,8 @@ declare -A debian_version=(
 )
 
 declare -A php_version=(
-	[default]='8.2'
+	[29]='8.2'
+	[default]='8.3'
 )
 
 declare -A cmd=(
diff --git a/versions.json b/versions.json
index 2bfbfa63..daac9da6 100644
--- a/versions.json
+++ b/versions.json
@@ -9,19 +9,19 @@
         "variant": "apache",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm-alpine": {
         "variant": "fpm-alpine",
         "base": "alpine",
         "baseVersion": "3.21",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       }
     }
   },
@@ -35,19 +35,19 @@
         "variant": "apache",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm": {
         "variant": "fpm",
         "base": "debian",
         "baseVersion": "bookworm",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       },
       "fpm-alpine": {
         "variant": "fpm-alpine",
         "base": "alpine",
         "baseVersion": "3.21",
-        "phpVersion": "8.2"
+        "phpVersion": "8.3"
       }
     }
   },

From 614be2855049e3175d4fdd4cc84cf152382cdb95 Mon Sep 17 00:00:00 2001
From: Kaloyan Nikolov <tzerber@gmail.com>
Date: Fri, 18 Apr 2025 18:42:58 +0300
Subject: [PATCH 5/5] Updated examples (#2405)

* Updated examples

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Lock examples to PostgreSQL 16

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Pin postgresql to 16 in Readme example

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Update .examples/docker-compose/insecure/mariadb/apache/compose.yaml

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Update .examples/docker-compose/insecure/postgres/apache/compose.yaml

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Update .examples/docker-compose/insecure/mariadb/fpm/compose.yaml

Co-authored-by: J0WI <J0WI@users.noreply.github.com>
Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Moved some comments on new lines.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Moved another comment to new line

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Unified across files / updated README file.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

* Use canonical links to external services.

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>

---------

Signed-off-by: Kaloyan Nikolov <tzerber@gmail.com>
Co-authored-by: J0WI <J0WI@users.noreply.github.com>
---
 .../insecure/mariadb/apache/compose.yaml      |  7 ++++-
 .../insecure/mariadb/fpm/compose.yaml         | 15 ++++++++--
 .../insecure/mariadb/fpm/web/Dockerfile       |  3 --
 .../insecure/postgres/apache/compose.yaml     |  5 ++++
 .../insecure/postgres/fpm/compose.yaml        | 13 ++++++--
 .../insecure/postgres/fpm/web/Dockerfile      |  3 --
 .../mariadb/apache/compose.yaml               | 17 +++++++----
 .../mariadb/apache/proxy/Dockerfile           |  2 +-
 .../with-nginx-proxy/mariadb/fpm/compose.yaml | 22 +++++++++++---
 .../mariadb/fpm/proxy/Dockerfile              |  2 +-
 .../mariadb/fpm/web/Dockerfile                |  3 --
 .../postgres/apache/compose.yaml              | 12 +++++++-
 .../postgres/apache/proxy/Dockerfile          |  2 +-
 .../postgres/fpm/compose.yaml                 | 22 ++++++++++----
 .../postgres/fpm/proxy/Dockerfile             |  2 +-
 .../postgres/fpm/web/Dockerfile               |  3 --
 README.md                                     | 30 +++++++++++++++----
 17 files changed, 120 insertions(+), 43 deletions(-)
 delete mode 100644 .examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
 delete mode 100644 .examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
 delete mode 100644 .examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile

diff --git a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
index c765190c..c05d7d8e 100644
--- a/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/apache/compose.yaml
@@ -1,6 +1,9 @@
 services:
+  # Note: MariaDB is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -12,6 +15,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
index 90520e08..64faef6c 100644
--- a/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/compose.yaml
@@ -1,6 +1,9 @@
 services:
+  # Note: MariaDB is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -12,6 +15,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -31,14 +36,18 @@ services:
       - db
       - redis
 
+  # Note: Nginx is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/nginx/
   web:
-    build: ./web
+    image: nginx:alpine-slim
     restart: always
     ports:
       - 127.0.0.1:8080:80
     volumes:
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
+      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
-      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     depends_on:
       - app
 
diff --git a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/insecure/mariadb/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/insecure/postgres/apache/compose.yaml b/.examples/docker-compose/insecure/postgres/apache/compose.yaml
index 19c75ba4..8ae34013 100644
--- a/.examples/docker-compose/insecure/postgres/apache/compose.yaml
+++ b/.examples/docker-compose/insecure/postgres/apache/compose.yaml
@@ -1,5 +1,8 @@
 services:
+  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
   db:
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -7,6 +10,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
diff --git a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml
index 4e268cab..8a88afd4 100644
--- a/.examples/docker-compose/insecure/postgres/fpm/compose.yaml
+++ b/.examples/docker-compose/insecure/postgres/fpm/compose.yaml
@@ -1,5 +1,8 @@
 services:
+  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
   db:
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -7,6 +10,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -26,14 +31,18 @@ services:
       - db
       - redis
 
+  # Note: Nginx is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/nginx/
   web:
-    build: ./web
+    image: nginx:alpine-slim
     restart: always
     ports:
       - 127.0.0.1:8080:80
     volumes:
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
+      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
-      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     depends_on:
       - app
 
diff --git a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile b/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/insecure/postgres/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
index e1a461d2..e1132818 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/compose.yaml
@@ -1,6 +1,9 @@
 services:
+  # Note: MariaDB is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -12,6 +15,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -33,9 +38,6 @@ services:
     depends_on:
       - db
       - redis
-      # Added proxy container dependency below. 
-      # It is unclear on when or why it happens, but sometimes NC manages to start before the proxy 
-      #  and it breaks for whatever weird reason resulting in the need of manual proxy container restart.
       - proxy
     networks:
       - proxy-tier
@@ -52,6 +54,9 @@ services:
       - db
       - redis
 
+  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
+  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
+  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -69,6 +74,8 @@ services:
     networks:
       - proxy-tier
 
+  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -85,7 +92,7 @@ services:
     depends_on:
       - proxy
 
-# self signed
+# self signed,outdated
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile
index 46fc7e26..6f449c7f 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/proxy/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:alpine
+FROM nginxproxy/nginx-proxy:1.7-alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
index fa77198a..13d4a40b 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/compose.yaml
@@ -1,6 +1,9 @@
 services:
+  # Note: MariaDB is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     command: --transaction-isolation=READ-COMMITTED
     restart: always
     volumes:
@@ -12,6 +15,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -32,12 +37,16 @@ services:
       - redis
       - proxy
 
+  # Note: Nginx is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/nginx/
   web:
-    build: ./web
+    image: nginx:alpine-slim
     restart: always
     volumes:
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro  
+      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
-      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -59,6 +68,9 @@ services:
       - db
       - redis
 
+  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
+  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
+  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -75,6 +87,8 @@ services:
     networks:
       - proxy-tier
 
+  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -91,7 +105,7 @@ services:
     depends_on:
       - proxy
 
-# self signed
+# self signed, outdated. 
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
index 46fc7e26..6f449c7f 100644
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/proxy/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:alpine
+FROM nginxproxy/nginx-proxy:1.7-alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
index 2eb4f638..035359f0 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/compose.yaml
@@ -1,5 +1,8 @@
 services:
+  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
   db:
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -7,6 +10,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -44,6 +49,9 @@ services:
       - db
       - redis
 
+  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
+  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
+  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -60,6 +68,8 @@ services:
     networks:
       - proxy-tier
 
+  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -74,7 +84,7 @@ services:
     depends_on:
       - proxy
 
-# self signed
+# self signed, outdated
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile
index 46fc7e26..6f449c7f 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/proxy/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:alpine
+FROM nginxproxy/nginx-proxy:1.7-alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
index 80be65a6..78654edd 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/compose.yaml
@@ -1,7 +1,8 @@
-version: '3'
-
 services:
+  # Note: PostgreSQL is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
   db:
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
     image: postgres:alpine
     restart: always
     volumes:
@@ -9,6 +10,8 @@ services:
     env_file:
       - db.env
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -29,12 +32,16 @@ services:
       - redis
       - proxy
 
+  # Note: Nginx is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/nginx/
   web:
-    build: ./web
+    image: nginx:alpine-slim
     restart: always
     volumes:
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - ./web/nginx.conf:/etc/nginx/nginx.conf:ro
+      # NOTE: The `volumes` included below should match those of the `app` container (unless you know what you're doing)
       - nextcloud:/var/www/html:z,ro
-      # NOTE: The `volumes` included here should match those of the `app` container (unless you know what you're doing)
     environment:
       - VIRTUAL_HOST=
       - LETSENCRYPT_HOST=
@@ -56,6 +63,9 @@ services:
       - db
       - redis
 
+  # Note: Nginx-proxy is an external service. You can find more information about the configuration here:
+  # Warning: Do not use :latest tags of nginx-proxy unless absolutely sure about the consequences.
+  # https://hub.docker.com/r/nginxproxy/nginx-proxy
   proxy:
     build: ./proxy
     restart: always
@@ -72,6 +82,8 @@ services:
     networks:
       - proxy-tier
 
+  # Note: Letsencrypt companion is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/r/nginxproxy/acme-companion
   letsencrypt-companion:
     image: nginxproxy/acme-companion
     restart: always
@@ -88,7 +100,7 @@ services:
     depends_on:
       - proxy
 
-# self signed
+# self signed, outdated
 #  omgwtfssl:
 #    image: paulczar/omgwtfssl
 #    restart: "no"
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile
index 46fc7e26..6f449c7f 100644
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/proxy/Dockerfile
@@ -1,3 +1,3 @@
-FROM nginxproxy/nginx-proxy:alpine
+FROM nginxproxy/nginx-proxy:1.7-alpine
 
 COPY uploadsize.conf /etc/nginx/conf.d/uploadsize.conf
diff --git a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
deleted file mode 100644
index 9e620aff..00000000
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/web/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM nginx:alpine
-
-COPY nginx.conf /etc/nginx/nginx.conf
diff --git a/README.md b/README.md
index 7de62124..3be70217 100644
--- a/README.md
+++ b/README.md
@@ -82,7 +82,7 @@ Database:
 ```console
 $ docker run -d \
 -v db:/var/lib/mysql \
-mariadb:10.11
+mariadb:lts
 ```
 
 ### Additional volumes
@@ -403,8 +403,11 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia
 
 ```yaml
 services:
+  # Note: MariaDB is external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     restart: always
     command: --transaction-isolation=READ-COMMITTED
     volumes:
@@ -415,6 +418,8 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -451,8 +456,11 @@ Make sure to pass in values for `MYSQL_ROOT_PASSWORD` and `MYSQL_PASSWORD` varia
 
 ```yaml
 services:
+  # Note: MariaDB is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/mariadb
   db:
-    image: mariadb:10.11
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: mariadb:lts
     restart: always
     command: --transaction-isolation=READ-COMMITTED
     volumes:
@@ -463,6 +471,8 @@ services:
       - MYSQL_DATABASE=nextcloud
       - MYSQL_USER=nextcloud
 
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always
@@ -481,15 +491,18 @@ services:
       - MYSQL_USER=nextcloud
       - MYSQL_HOST=db
 
+  # Note: Nginx is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/nginx/
   web:
-    image: nginx
+    image: nginx:alpine-slim
     restart: always
     ports:
       - 8080:80
     depends_on:
       - app
     volumes:
-      - ./nginx.conf:/etc/nginx/nginx.conf:ro
+      # https://docs.nextcloud.com/server/latest/admin_manual/installation/nginx.html
+      - ./nginx.conf:/etc/nginx/nginx.conf:ro 
     volumes_from:
       - app
 
@@ -514,8 +527,11 @@ Example:
 
 ```yaml
 services:
+  # Note: PostgreSQL is external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/postgres
   db:
-    image: postgres
+    # Note: Check the recommend version here: https://docs.nextcloud.com/server/latest/admin_manual/installation/system_requirements.html#server
+    image: postgres:alpine
     restart: always
     volumes:
       - db:/var/lib/postgresql/data
@@ -527,6 +543,8 @@ services:
       - postgres_db
       - postgres_password
       - postgres_user
+  # Note: Redis is an external service. You can find more information about the configuration here:
+  # https://hub.docker.com/_/redis
   redis:
     image: redis:alpine
     restart: always