Merge 0bb3a0417f into f6d767efb1

Runs update.sh
2025-07-30 10:18:05 +02:00 · 2024-09-22 18:53:59 +02:00 · 2024-09-22 00:34:53 +00:00 · 2024-09-18 20:45:28 +00:00 · 2024-09-18 20:45:15 +00:00 · 2024-09-18 19:43:16 +00:00
36 changed files with 60 additions and 20 deletions
--- a/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/apache/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -30,6 +33,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/mariadb/apache/redis.env
+++ b/.examples/docker-compose/insecure/mariadb/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/mariadb/fpm/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -28,6 +31,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/mariadb/fpm/redis.env
+++ b/.examples/docker-compose/insecure/mariadb/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/apache/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -25,6 +28,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/postgres/apache/redis.env
+++ b/.examples/docker-compose/insecure/postgres/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/insecure/postgres/fpm/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -23,6 +26,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/insecure/postgres/fpm/redis.env
+++ b/.examples/docker-compose/insecure/postgres/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -31,6 +34,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/docker-compose.yml
@ -17,6 +17,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -28,6 +31,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/mariadb/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:apache
@ -26,6 +29,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/apache/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/docker-compose.yml
@ -12,6 +12,9 @@ services:
  redis:
    image: redis:alpine
    restart: always
+    command: /bin/sh -c "redis-server --requirepass $$REDIS_HOST_PASSWORD"
+    env_file:
+      - redis.env

  app:
    image: nextcloud:fpm-alpine
@ -23,6 +26,7 @@ services:
      - REDIS_HOST=redis
    env_file:
      - db.env
+      - redis.env
    depends_on:
      - db
      - redis
--- a/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
+++ b/.examples/docker-compose/with-nginx-proxy/postgres/fpm/redis.env
@ -0,0 +1 @@
+REDIS_HOST_PASSWORD=
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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; \
--- 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
--- 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
--- 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")")"
Author	SHA1	Message	Date
Fee Fladder	fdcb67998e	Merge `0bb3a0417f` into `f6d767efb1`	2024-09-22 18:53:59 +02:00
GitHub Workflow	f6d767efb1	Runs update.sh	2024-09-22 00:34:53 +00:00
GitHub Workflow	30b570f0b5	Runs update.sh	2024-09-18 20:45:28 +00:00
Florian Latifi	2bc1036e61	Exclude autoconfig.php from user config check (#2290 ) Signed-off-by: Florian Latifi <mail@florian-latifi.at>	2024-09-18 20:45:15 +00:00
John Molakvoæ	a1e93f429c	Bump stable to 29.0.7 (#2297 ) Fix #2294 Signed-off-by: John Molakvoæ <skjnldsv@users.noreply.github.com>	2024-09-18 19:43:16 +00:00
Fee Gevaert	0bb3a0417f	updated compose according to #1608 Signed-off-by: Fee Gevaert <fee.gevaert@opengeohub.org>	2023-06-12 16:24:00 +02:00