From a1e93f429cb2fbdd66c284aa4ea41ae217b4e482 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@users.noreply.github.com>
Date: Wed, 18 Sep 2024 21:43:16 +0200
Subject: [PATCH 1/5] Bump stable to 29.0.7 (#2297)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix #2294

Signed-off-by: John Molakvoæ <skjnldsv@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 8d90d85b..a7718bc0 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 set -Eeuo pipefail
 
-stable_channel='29.0.6'
+stable_channel='29.0.7'
 
 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"

From 2bc1036e611992c56a2cb5e9808698990256574c Mon Sep 17 00:00:00 2001
From: Florian Latifi <mail@florian-latifi.at>
Date: Wed, 18 Sep 2024 22:45:15 +0200
Subject: [PATCH 2/5] Exclude autoconfig.php from user config check (#2290)

Signed-off-by: Florian Latifi <mail@florian-latifi.at>
---
 docker-entrypoint.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi

From 30b570f0b553736d63dc63cf487ff1e5e5331474 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Wed, 18 Sep 2024 20:45:28 +0000
Subject: [PATCH 3/5] Runs update.sh

---
 28/apache/entrypoint.sh     | 2 +-
 28/fpm-alpine/entrypoint.sh | 2 +-
 28/fpm/entrypoint.sh        | 2 +-
 29/apache/entrypoint.sh     | 2 +-
 29/fpm-alpine/entrypoint.sh | 2 +-
 29/fpm/entrypoint.sh        | 2 +-
 30/apache/entrypoint.sh     | 2 +-
 30/fpm-alpine/entrypoint.sh | 2 +-
 30/fpm/entrypoint.sh        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/28/apache/entrypoint.sh b/28/apache/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/28/apache/entrypoint.sh
+++ b/28/apache/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/28/fpm-alpine/entrypoint.sh b/28/fpm-alpine/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/28/fpm-alpine/entrypoint.sh
+++ b/28/fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/28/fpm/entrypoint.sh b/28/fpm/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/28/fpm/entrypoint.sh
+++ b/28/fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/29/apache/entrypoint.sh b/29/apache/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/29/apache/entrypoint.sh
+++ b/29/apache/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/29/fpm-alpine/entrypoint.sh b/29/fpm-alpine/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/29/fpm-alpine/entrypoint.sh
+++ b/29/fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/29/fpm/entrypoint.sh b/29/fpm/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/29/fpm/entrypoint.sh
+++ b/29/fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/30/apache/entrypoint.sh b/30/apache/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/30/apache/entrypoint.sh
+++ b/30/apache/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/30/fpm-alpine/entrypoint.sh b/30/fpm-alpine/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/30/fpm-alpine/entrypoint.sh
+++ b/30/fpm-alpine/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi
diff --git a/30/fpm/entrypoint.sh b/30/fpm/entrypoint.sh
index 4e06fcc4..8e178f2e 100755
--- a/30/fpm/entrypoint.sh
+++ b/30/fpm/entrypoint.sh
@@ -280,7 +280,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
     for cfgPath in /usr/src/nextcloud/config/*.php; do
         cfgFile=$(basename "$cfgPath")
 
-        if [ "$cfgFile" != "config.sample.php" ]; then
+        if [ "$cfgFile" != "config.sample.php" ] && [ "$cfgFile" != "autoconfig.php" ]; then
             if ! cmp -s "/usr/src/nextcloud/config/$cfgFile" "/var/www/html/config/$cfgFile"; then
                 echo "Warning: /var/www/html/config/$cfgFile differs from the latest version of this image at /usr/src/nextcloud/config/$cfgFile"
             fi

From f6d767efb1c8853952c138f4b6429a2441fbe6e6 Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Sun, 22 Sep 2024 00:34:53 +0000
Subject: [PATCH 4/5] Runs update.sh

---
 28/apache/Dockerfile     | 2 +-
 28/fpm-alpine/Dockerfile | 2 +-
 28/fpm/Dockerfile        | 2 +-
 29/apache/Dockerfile     | 2 +-
 29/fpm-alpine/Dockerfile | 2 +-
 29/fpm/Dockerfile        | 2 +-
 30/apache/Dockerfile     | 2 +-
 30/fpm-alpine/Dockerfile | 2 +-
 30/fpm/Dockerfile        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile
index 9ac2e524..f9637bd7 100644
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile
index 02ab2450..24f4d938 100644
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@@ -63,7 +63,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile
index 17432c85..4a8da235 100644
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index 371d4cd7..a81658c2 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 5e8aa0f8..017de203 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -63,7 +63,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index a134d720..00776307 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 93642f7b..907fc57e 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index 11c6e1ba..a8b5faa6 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -63,7 +63,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index e9a09f6a..e2a52ed2 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -65,7 +65,7 @@ RUN set -ex; \
     ; \
     \
 # pecl will claim success even if one install fails, so we need to perform each install separately
-    pecl install APCu-5.1.23; \
+    pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
     pecl install redis-6.0.2; \

From 9ff7b6a5297714f142df419352511183302c783a Mon Sep 17 00:00:00 2001
From: GitHub Workflow <workflow@github.com>
Date: Sat, 5 Oct 2024 00:31:43 +0000
Subject: [PATCH 5/5] Runs update.sh

---
 28/apache/Dockerfile     | 2 +-
 28/fpm-alpine/Dockerfile | 2 +-
 28/fpm/Dockerfile        | 2 +-
 29/apache/Dockerfile     | 2 +-
 29/fpm-alpine/Dockerfile | 2 +-
 29/fpm/Dockerfile        | 2 +-
 30/apache/Dockerfile     | 2 +-
 30/fpm-alpine/Dockerfile | 2 +-
 30/fpm/Dockerfile        | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/28/apache/Dockerfile b/28/apache/Dockerfile
index f9637bd7..5834feec 100644
--- a/28/apache/Dockerfile
+++ b/28/apache/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/28/fpm-alpine/Dockerfile b/28/fpm-alpine/Dockerfile
index 24f4d938..a03b7cbb 100644
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/28/fpm/Dockerfile b/28/fpm/Dockerfile
index 4a8da235..00980561 100644
--- a/28/fpm/Dockerfile
+++ b/28/fpm/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile
index a81658c2..9cec1c9d 100644
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile
index 017de203..2469a6bb 100644
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile
index 00776307..b5836693 100644
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile
index 907fc57e..abcd9e7c 100644
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile
index a8b5faa6..9a553d78 100644
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@@ -66,7 +66,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \
diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile
index e2a52ed2..2877c10e 100644
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@@ -68,7 +68,7 @@ RUN set -ex; \
     pecl install APCu-5.1.24; \
     pecl install imagick-3.7.0; \
     pecl install memcached-3.2.0; \
-    pecl install redis-6.0.2; \
+    pecl install redis-6.1.0; \
     \
     docker-php-ext-enable \
         apcu \