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/6] 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/6] 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/6] 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 4f130dc7527e9f405349767596b168c81b45ba24 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Thu, 7 Nov 2024 23:24:17 +0000
Subject: [PATCH 4/6] Runs update.sh

---
 28/apache/Dockerfile     |  6 +++---
 28/fpm-alpine/Dockerfile |  6 +++---
 28/fpm/Dockerfile        |  6 +++---
 29/apache/Dockerfile     |  6 +++---
 29/fpm-alpine/Dockerfile |  6 +++---
 29/fpm/Dockerfile        |  6 +++---
 30/apache/Dockerfile     |  6 +++---
 30/fpm-alpine/Dockerfile |  6 +++---
 30/fpm/Dockerfile        |  6 +++---
 latest.txt               |  2 +-
 versions.json            | 18 +++++++++---------
 11 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile
index d63fb3a8..00bfaa72 100644
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile
index a7352299..18af3386 100644
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile
index ae69769d..40598ea8 100644
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 28.0.11
+ENV NEXTCLOUD_VERSION 28.0.12
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 8e9316c9..58132fb2 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 5344aed5..de280bc7 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index a69317bb..c0ebab1a 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 29.0.8
+ENV NEXTCLOUD_VERSION 29.0.9
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index b01d9611..0e0fd6aa 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -140,7 +140,7 @@ RUN { \
     } > /etc/apache2/conf-available/apache-limits.conf; \
     a2enconf apache-limits
 
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
 
 RUN set -ex; \
     fetchDeps=" \
@@ -150,8 +150,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index a6197cc8..79783a65 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -120,7 +120,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
 
 RUN set -ex; \
     apk add --no-cache --virtual .fetch-deps \
@@ -128,8 +128,8 @@ RUN set -ex; \
         gnupg \
     ; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index 9ab2e055..4258ff9d 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -125,7 +125,7 @@ RUN { \
 VOLUME /var/www/html
 
 
-ENV NEXTCLOUD_VERSION 30.0.1
+ENV NEXTCLOUD_VERSION 30.0.2
 
 RUN set -ex; \
     fetchDeps=" \
@@ -135,8 +135,8 @@ RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends $fetchDeps; \
     \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc"; \
     export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
     gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
diff --git a/latest.txt b/latest.txt
index 1c8398ee..4f3a0694 100644
--- a/latest.txt
+++ b/latest.txt
@@ -1 +1 @@
-30.0.1
+30.0.2
diff --git a/versions.json b/versions.json
index db86e255..e719e79f 100644
--- a/versions.json
+++ b/versions.json
@@ -1,9 +1,9 @@
 {
   "30": {
     "branch": "30",
-    "version": "30.0.1",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.1.tar.bz2.asc",
+    "version": "30.0.2",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.2.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
@@ -27,9 +27,9 @@
   },
   "29": {
     "branch": "29",
-    "version": "29.0.8",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.8.tar.bz2.asc",
+    "version": "29.0.9",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.9.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",
@@ -53,9 +53,9 @@
   },
   "28": {
     "branch": "28",
-    "version": "28.0.11",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.11.tar.bz2.asc",
+    "version": "28.0.12",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-28.0.12.tar.bz2.asc",
     "variants": {
       "apache": {
         "variant": "apache",

From b9ed2426a0a2c7feb954c9b722d1390cc8fbd26b Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 7 Nov 2024 23:27:03 +0000
Subject: [PATCH 5/6] Bump stable to 30.0.2

Signed-off-by: J0WI <J0WI@users.noreply.github.com>
---
 generate-stackbrew-library.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index 43c9aab0..7a1332ef 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-stable_channel='30.0.1'
+stable_channel='30.0.2'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

From dd663d60c69954c0b50b68c4d870f9910ddbfab9 Mon Sep 17 00:00:00 2001
From: rugk <rugk+git@posteo.de>
Date: Fri, 8 Nov 2024 00:38:16 +0100
Subject: [PATCH 6/6] Add example command for copying (#2327)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

As for https://github.com/nextcloud/docker/issues/2266 and the re-appearing message IMHO, it is quite convenient to have a command to copy here if you just have not changed any config files…

Signed-off-by: rugk <rugk+git@posteo.de>
---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index ab6608ad..8933161e 100644
--- a/README.md
+++ b/README.md
@@ -242,6 +242,10 @@ During a fresh Nextcloud installation, the latest version (from the image) of th
 The copied files, however, are **not** automatically overwritten whenever you update your environment with a newer Nextcloud image. This is to prevent local changes in `/var/www/html/config` from being unexpectedly overwritten. This may lead to your image-specific configuration files becoming outdated and image functionality not matching that which is documented.
 
 A warning will be generated in the container log output when outdated image-specific configuration files are detected at startup in a running container. When you see this warning, you should manually compare (or copy) the files from `/usr/src/nextcloud/config` to `/var/www/html/config`.
+A command to copy these configs would e.g. be:
+```console
+docker exec <container-name> sh -c "cp /usr/src/nextcloud/config/*.php /var/www/html/config"
+```
 
 As long as you have not modified any of the provided config files in `/var/www/html/config` (other than `config.php`) or only added new ones with names that do not conflict with the image specific ones, copying the new ones into place should be safe (but check the source path `/usr/src/nextcloud/config` for any newly named config files to avoid new overlaps just in case).