Merge e381107323 into a19d68f081

Bump stable to 31.0.4
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
2025-07-17 21:28:05 +02:00 · 2025-04-18 16:47:21 +02:00 · 2025-04-18 13:51:26 +00:00 · 2025-04-18 13:37:27 +00:00 · 2025-04-18 13:13:10 +00:00 · 2025-04-18 13:12:44 +00:00
30 changed files with 508 additions and 385 deletions
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/README.MD
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/README.MD
@ -0,0 +1,5 @@
+This docker-compose.yml file will create a nextcloud instance with signed certs using the lets encrypt companion and the nginx reverse proxy.  Collabora office will also be deployed using signed certs. To use collabora the app must be installed within nextcloud and configured to use office.DOMAIN.TLD.  
+
+There is no need to specify a port, simply the pubilc domain used to create your certs for the office instance.  Ports, 443 and 80 should be forwarded to the server.
+
+![Callabora Settings](collaboraOnlineNCSettings.png)
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/collaboraOnlineNCSettings.png
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/collaboraOnlineNCSettings.png
--- a/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/docker-compose.yml
+++ b/.examples/docker-compose/with-nginx-proxy-self-signed-ssl-collabora-office-mariadb/docker-compose.yml
@ -0,0 +1,109 @@
+version: '3' 
+
+services:
+
+  proxy:
+    image: jwilder/nginx-proxy:alpine
+    labels:
+      - "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy=true"
+    container_name: nextcloud-proxy
+    networks:
+      - nextcloud_network
+    ports:
+      - 80:80
+      - 443:443
+    volumes:
+      - ./proxy/conf.d:/etc/nginx/conf.d:rw
+      - ./proxy/vhost.d:/etc/nginx/vhost.d:rw
+      - ./proxy/html:/usr/share/nginx/html:rw
+      - ./proxy/certs:/etc/nginx/certs:ro
+      - /etc/localtime:/etc/localtime:ro
+      - /var/run/docker.sock:/tmp/docker.sock:ro
+    restart: unless-stopped
+  
+  letsencrypt:
+    image: jrcs/letsencrypt-nginx-proxy-companion
+    container_name: nextcloud-letsencrypt
+    depends_on:
+      - proxy
+    networks:
+      - nextcloud_network
+    volumes:
+      - ./proxy/certs:/etc/nginx/certs:rw
+      - ./proxy/vhost.d:/etc/nginx/vhost.d:rw
+      - ./proxy/html:/usr/share/nginx/html:rw
+      - /etc/localtime:/etc/localtime:ro
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    restart: unless-stopped
+  db:
+    image: mariadb
+    container_name: nextcloud-mariadb
+    networks:
+      - nextcloud_network
+    volumes:
+      - db:/var/lib/mysql
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+    # Create a root password for the maraiadb instance.
+      - MYSQL_ROOT_PASSWORD=CREATE-A-SECURE-ROOT-PASSWORD-HERE
+    # Create a password for the nextcloud users.  If you have to manually connect your database you would use the nextcloud user and this password.
+      - MYSQL_PASSWORD=CREATE-A-SECURE-NEXTCLOUD-USER-PASSWORD-HERE
+      - MYSQL_DATABASE=nextcloud
+      - MYSQL_USER=nextcloud
+    restart: unless-stopped
+  
+  app:
+    image: nextcloud:latest
+    container_name: nextcloud-app
+    networks:
+      - nextcloud_network
+    depends_on:
+      - letsencrypt
+      - proxy
+      - db
+    volumes:
+      - nextcloud:/var/www/html
+      - ./app/config:/var/www/html/config
+      - ./app/custom_apps:/var/www/html/custom_apps
+      - ./app/data:/var/www/html/data
+      - ./app/themes:/var/www/html/themes
+      - /etc/localtime:/etc/localtime:ro
+    environment:
+    # The VIRTUAL_HOST and LETSENCRYPT_HOST should use the same publically reachable domain for your nextlcloud instance.
+      - VIRTUAL_HOST=cloud.DOMAIN.TLD
+      - LETSENCRYPT_HOST=cloud.DOMAIN.TLD
+    # This needs to be a real email as it will be used by let's encrypt for your cert and is used to warn you about renewals.
+      - LETSENCRYPT_EMAIL=YOUR-EMAIL@DOMAIN.TDL
+    restart: unless-stopped
+  collab:
+    image: collabora/code
+    container_name: nextcloud-collab
+    networks:
+      - nextcloud_network
+    depends_on:
+      - proxy
+      - letsencrypt
+    cap_add:
+     - MKNOD
+    ports:
+      - 9980:9980
+    environment:
+    # This nees to be the same as what you set your app domain too (ex: cloud.domain.tld).
+      - domain=cloud\\.DOMAIN\\.TDL
+      - username=admin
+    # Create a passoword for the collabora office admin page.
+      - password=CREATE-A-SECURE-PASSWORD-HERE
+      - VIRTUAL_PROTO=https
+      - VIRTUAL_PORT=443
+    # The VIRTUAL_HOST and LETSENCRYPT_HOST should use the same publically reachable domain for your collabora instance (ex: office.domain.tld).
+      - VIRTUAL_HOST=office.DOMAIN.TLD
+      - LETSENCRYPT_HOST=office.DOMAIN.TLD
+    # This needs to be a real email as it will be used by let's encrypt for your cert and is used to warn you about renewals.
+      - LETSENCRYPT_EMAIL=YOUR-EMAIL@DOMAIN.TDL
+    restart: unless-stopped 
+volumes:
+  nextcloud:
+  db: 
+  
+networks:
+  nextcloud_network:
--- a/.github/ISSUE_TEMPLATE/01-Image_issue.md
+++ b/.github/ISSUE_TEMPLATE/01-Image_issue.md
@ -1,6 +1,7 @@
 ---
-name: 🐛 Image issue
-about: Issues related to the Nextcloud Docker image
+name: 🐛 Report a bug in the image
+about: Create a report to help us improve the image
+labels: "bug, 0. Needs triage"
 ---

 <!--
--- a/.github/ISSUE_TEMPLATE/02-Image_enhancement
+++ b/.github/ISSUE_TEMPLATE/02-Image_enhancement
@ -0,0 +1,15 @@
+---
+name: 🚀 Suggest an enhancement
+about: Suggest an idea for improving the image
+labels: "enhancement, 0. Needs triage"
+---
+
+<!--
+Thanks for suggesting an idea to improve the Nextcloud Docker image!
+
+This image is maintained by volunteers so if you're able to assist with implementing your idea, please mention that (and consider submitting a PR as well).
+
+Note: This is the issue tracker of the official Nextcloud **Docker image**, please do NOT use this to suggestion enhancements in Nextcloud Server itself. 
+
+To learn more about official images, see https://github.com/docker-library/faq
+-->
--- a/29/apache/Dockerfile
+++ b/29/apache/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-apache-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -166,7 +150,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 29.0.15
+ENV NEXTCLOUD_VERSION 29.0.16

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +160,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.15.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/29/apache/entrypoint.sh
+++ b/29/apache/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:8.2-fpm-alpine3.21

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -146,7 +130,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.15
+ENV NEXTCLOUD_VERSION 29.0.16

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +138,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/29/fpm-alpine/entrypoint.sh
+++ b/29/fpm-alpine/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/29/fpm/Dockerfile
+++ b/29/fpm/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-fpm-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -151,7 +135,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 29.0.15
+ENV NEXTCLOUD_VERSION 29.0.16

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +145,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.15.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/29/fpm/entrypoint.sh
+++ b/29/fpm/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/30/apache/Dockerfile
+++ b/30/apache/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-apache-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -166,7 +150,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 30.0.9
+ENV NEXTCLOUD_VERSION 30.0.10

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +160,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.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/apache/entrypoint.sh
+++ b/30/apache/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
 FROM php:8.2-fpm-alpine3.21

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -146,7 +130,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.9
+ENV NEXTCLOUD_VERSION 30.0.10

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +138,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm-alpine/entrypoint.sh
+++ b/30/fpm-alpine/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/30/fpm/Dockerfile
+++ b/30/fpm/Dockerfile
@ -1,9 +1,6 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
 FROM php:8.2-fpm-bookworm

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -151,7 +135,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 30.0.9
+ENV NEXTCLOUD_VERSION 30.0.10

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +145,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.9.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/30/fpm/entrypoint.sh
+++ b/30/fpm/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/31/apache/Dockerfile
+++ b/31/apache/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-apache-bookworm
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-apache-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -166,7 +150,7 @@ RUN { \
    } > /etc/apache2/conf-available/apache-limits.conf; \
    a2enconf apache-limits

-ENV NEXTCLOUD_VERSION 31.0.3
+ENV NEXTCLOUD_VERSION 31.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -176,8 +160,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-31.0.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/apache/entrypoint.sh
+++ b/31/apache/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/31/fpm-alpine/Dockerfile
+++ b/31/fpm-alpine/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.3-fpm-alpine3.21
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -65,23 +62,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -146,7 +130,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 31.0.3
+ENV NEXTCLOUD_VERSION 31.0.4

 RUN set -ex; \
    apk add --no-cache --virtual .fetch-deps \
@ -154,8 +138,8 @@ RUN set -ex; \
        gnupg \
    ; \
    \
-    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com  --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/fpm-alpine/entrypoint.sh
+++ b/31/fpm-alpine/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/31/fpm/Dockerfile
+++ b/31/fpm/Dockerfile
@ -1,8 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-debian.template
-FROM php:8.3-fpm-bookworm
-
-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
+FROM php:8.2-fpm-bookworm

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
@ -68,23 +65,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-5.1.24; \
    pecl install igbinary-3.2.16; \
+    pecl install imagick-3.8.0; \
    pecl install memcached-3.3.0 \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-6.2.0 \
@ -151,7 +135,7 @@ RUN { \
 VOLUME /var/www/html


-ENV NEXTCLOUD_VERSION 31.0.3
+ENV NEXTCLOUD_VERSION 31.0.4

 RUN set -ex; \
    fetchDeps=" \
@ -161,8 +145,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-31.0.3.tar.bz2"; \
-    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc"; \
+    curl -fsSL -o nextcloud.tar.bz2 "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2"; \
+    curl -fsSL -o nextcloud.tar.bz2.asc "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2.asc"; \
    export GNUPGHOME="$(mktemp -d)"; \
 # gpg key from https://nextcloud.com/nextcloud.asc
    gpg --batch --keyserver keyserver.ubuntu.com --recv-keys 28806A878AE423A28372792ED75899B9A724937A; \
--- a/31/fpm/entrypoint.sh
+++ b/31/fpm/entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- a/Dockerfile-alpine.template
+++ b/Dockerfile-alpine.template
@ -1,8 +1,5 @@
 FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%%

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -64,23 +61,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-%%APCU_VERSION%%; \
    pecl install igbinary-%%IGBINARY_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
    pecl install memcached-%%MEMCACHED_VERSION%% \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-%%REDIS_VERSION%% \
--- a/Dockerfile-debian.template
+++ b/Dockerfile-debian.template
@ -1,8 +1,5 @@
 FROM php:%%PHP_VERSION%%-%%VARIANT%%-%%DEBIAN_VERSION%%

-# Define the commit hash for imagick as a variable
-ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
-
 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
    \
@ -67,23 +64,10 @@ RUN set -ex; \
        zip \
    ; \
    \
-# The master version on the imagick repository is compatible with PHP 8.3. However, the PECL version is not updated yet.
-# As soon as it will get updated, we can switch back to the PECL version, instead of having this workaround.
-    curl -fsSL -o imagick.tar.gz "https://github.com/Imagick/imagick/archive/$IMAGICK_COMMIT_HASH.tar.gz"; \
-    tar -xzf imagick.tar.gz -C /tmp; \
-    rm imagick.tar.gz; \
-    cd "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    sed -i "s/@PACKAGE_VERSION@/git-$(echo ${IMAGICK_COMMIT_HASH} | cut -c 1-7)/" php_imagick.h; \
-    phpize; \
-    ./configure; \
-    make; \
-    make install; \
-    cd; \
-    rm -r "/tmp/imagick-$IMAGICK_COMMIT_HASH"; \
-    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install APCu-%%APCU_VERSION%%; \
    pecl install igbinary-%%IGBINARY_VERSION%%; \
+    pecl install imagick-%%IMAGICK_VERSION%%; \
    pecl install memcached-%%MEMCACHED_VERSION%% \
        --configureoptions 'enable-memcached-igbinary="yes"'; \
    pecl install redis-%%REDIS_VERSION%% \
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -23,32 +23,39 @@ run_as() {
 run_path() {
    local hook_folder_path="/docker-entrypoint-hooks.d/$1"
    local return_code=0
+    local found=0

-    if ! [ -d "${hook_folder_path}" ]; then
-        echo "=> Skipping the folder \"${hook_folder_path}\", because it doesn't exist"
+    echo "=> Searching for hook scripts (*.sh) to run, located in the folder \"${hook_folder_path}\""
+
+    if ! [ -d "${hook_folder_path}" ] || directory_empty "${hook_folder_path}"; then
+        echo "==> Skipped: the \"$1\" folder is empty (or does not exist)"
        return 0
    fi

-    echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}"
-
-    (
-        find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | while read -r script_file_path; do
+    find "${hook_folder_path}" -maxdepth 1 -iname '*.sh' '(' -type f -o -type l ')' -print | sort | (
+        while read -r script_file_path; do
            if ! [ -x "${script_file_path}" ]; then
-                echo "==> The script \"${script_file_path}\" was skipped, because it didn't have the executable flag"
+                echo "==> The script \"${script_file_path}\" was skipped, because it lacks the executable flag"
+                found=$((found-1))
                continue
            fi

            echo "==> Running the script (cwd: $(pwd)): \"${script_file_path}\""
-
+            found=$((found+1))
            run_as "${script_file_path}" || return_code="$?"

            if [ "${return_code}" -ne "0" ]; then
-                echo "==> Failed at executing \"${script_file_path}\". Exit code: ${return_code}"
+                echo "==> Failed at executing script \"${script_file_path}\". Exit code: ${return_code}"
                exit 1
            fi

-            echo "==> Finished the script: \"${script_file_path}\""
+            echo "==> Finished executing the script: \"${script_file_path}\""
        done
+        if [ "$found" -lt "1" ]; then
+            echo "==> Skipped: the \"$1\" folder does not contain any valid scripts"
+        else
+            echo "=> Completed executing scripts in the \"$1\" folder"
+        fi
    )
 }

@ -114,13 +121,21 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
            # check if redis host is an unix socket path
            if [ "$(echo "$REDIS_HOST" | cut -c1-1)" = "/" ]; then
              if [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                  echo "session.save_path = \"unix://${REDIS_HOST}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                  echo "session.save_path = \"unix://${REDIS_HOST}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
              else
                echo "session.save_path = \"unix://${REDIS_HOST}\""
              fi
            # check if redis password has been set
            elif [ -n "${REDIS_HOST_PASSWORD+x}" ]; then
+                if [ -n "${REDIS_HOST_USER+x}" ]; then
+                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth[]=${REDIS_HOST_USER}&auth[]=${REDIS_HOST_PASSWORD}\""
+                else
                    echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}?auth=${REDIS_HOST_PASSWORD}\""
+                fi
            else
                echo "session.save_path = \"tcp://${REDIS_HOST}:${REDIS_HOST_PORT:=6379}\""
            fi
@ -237,12 +252,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
                        fi
                        if [ -n "${NEXTCLOUD_TRUSTED_DOMAINS+x}" ]; then
                            echo "Setting trusted domains…"
+			    set -f # turn off glob
                            NC_TRUSTED_DOMAIN_IDX=1
-                            for DOMAIN in $NEXTCLOUD_TRUSTED_DOMAINS ; do
-                                DOMAIN=$(echo "$DOMAIN" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
-                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=$DOMAIN"
+                            for DOMAIN in ${NEXTCLOUD_TRUSTED_DOMAINS}; do
+                                DOMAIN=$(echo "${DOMAIN}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')
+                                run_as "php /var/www/html/occ config:system:set trusted_domains $NC_TRUSTED_DOMAIN_IDX --value=\"${DOMAIN}\""
                                NC_TRUSTED_DOMAIN_IDX=$((NC_TRUSTED_DOMAIN_IDX+1))
                            done
+			    set +f # turn glob back on
                        fi

                        run_path post-installation
--- 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.9'
+stable_channel='31.0.4'

 self="$(basename "$BASH_SOURCE")"
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
--- a/latest.txt
+++ b/latest.txt
@ -1 +1 @@
-31.0.3
+31.0.4
--- a/update.sh
+++ b/update.sh
@ -11,7 +11,6 @@ declare -A debian_version=(

 declare -A php_version=(
 	[default]='8.2'
-	[31]='8.3'
 )

 declare -A cmd=(
@ -55,7 +54,7 @@ igbinary_version="$(
 )"

 imagick_version="$(
-	git ls-remote --tags https://github.com/mkoppanen/imagick.git \
+	git ls-remote --tags https://github.com/imagick/imagick.git \
 		| cut -d/ -f3 \
 		| grep -viE '[a-z]' \
 		| tr -d '^{}' \
--- a/versions.json
+++ b/versions.json
@ -1,35 +1,35 @@
 {
  "31": {
    "branch": "31",
-    "version": "31.0.3",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.3.tar.bz2.asc",
+    "version": "31.0.4",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-31.0.4.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
        "base": "debian",
        "baseVersion": "bookworm",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      },
      "fpm": {
        "variant": "fpm",
        "base": "debian",
        "baseVersion": "bookworm",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      },
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
        "baseVersion": "3.21",
-        "phpVersion": "8.3"
+        "phpVersion": "8.2"
      }
    }
  },
  "30": {
    "branch": "30",
-    "version": "30.0.9",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.9.tar.bz2.asc",
+    "version": "30.0.10",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-30.0.10.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
@ -53,9 +53,9 @@
  },
  "29": {
    "branch": "29",
-    "version": "29.0.15",
-    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2",
-    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.15.tar.bz2.asc",
+    "version": "29.0.16",
+    "url": "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2",
+    "ascUrl": "https://download.nextcloud.com/server/releases/nextcloud-29.0.16.tar.bz2.asc",
    "variants": {
      "apache": {
        "variant": "apache",
Author	SHA1	Message	Date
Aaron Skarlupka	0110f28def	Merge `e381107323` into `a19d68f081`	2025-04-18 16:47:21 +02:00
J0WI	a19d68f081	Bump stable to 31.0.4 Signed-off-by: J0WI <J0WI@users.noreply.github.com>	2025-04-18 13:51:26 +00:00
J0WI	f130178136	Imagick 3.8.0 (#2417 ) * Revert "Build imagick for PHP 8.3 (#2394)" This reverts commit `af00599148`. * PHP imagick 3.8.0 Signed-off-by: J0WI <J0WI@users.noreply.github.com> --------- Signed-off-by: J0WI <J0WI@users.noreply.github.com>	2025-04-18 13:37:27 +00:00
GitHub Workflow	f3e0c49c38	Runs update.sh	2025-04-18 13:13:10 +00:00
Josh	b36cfa65da	fix(hooks): make the output more uniform and delineated (#2343 ) * fix(hooks): Consistent logging + skip when empty too - Use "Searching for scripts [...] located in [...]" consistently (i.e. for each hook_folder_path instead of only for some / under some conditions) - Skip early if a given hook folder is empty too (not just nonexistent) - Add feature name (hooks) to all messaging for clarity Signed-off-by: Josh <josh.t.richards@gmail.com> * fix(hooks): Clear state delineation / consistent output Signed-off-by: Josh <josh.t.richards@gmail.com> --------- Signed-off-by: Josh <josh.t.richards@gmail.com>	2025-04-18 13:12:44 +00:00
Jean-Kevin KPADEY	6e8f484c4b	fix: handle redis host user in the configuration of the session handler (#2411 ) Signed-off-by: Jean-Kevin KPADEY <jeankevin.kpadey@gmail.com>	2025-04-18 13:11:41 +00:00
Josh	43311addf2	meta(templates): Add labels to bug reports automatically (#2401 ) Signed-off-by: Josh <josh.t.richards@gmail.com>	2025-04-18 13:06:27 +00:00
Josh	558ff494d3	meta(templates): Establish a dedicated Enhancement idea issue option/template (#2402 ) Signed-off-by: Josh <josh.t.richards@gmail.com>	2025-04-18 13:05:39 +00:00
GitHub Workflow	7832770350	Runs update.sh	2025-04-18 13:05:15 +00:00
Josh	a2995dde03	fix: prevent glob expansion on wildcard trusted_domains (#2344 ) * fix: prevent glob expansion on wildcard trusted_domains Signed-off-by: Josh <josh.t.richards@gmail.com> * fix: move glob change outside the loop Signed-off-by: Josh <josh.t.richards@gmail.com> --------- Signed-off-by: Josh <josh.t.richards@gmail.com>	2025-04-18 13:04:55 +00:00
GitHub Workflow	88ef913597	Runs update.sh	2025-04-18 00:35:43 +00:00
Aaron Skarlupka	e381107323	Update README.MD Signed-off-by: aarskar <aaronskarcode@gmail.com>	2019-02-22 14:48:00 -06:00
Aaron Skarlupka	02e6f4339c	Add files via upload Signed-off-by: aarskar <aaronskarcode@gmail.com>	2019-02-22 14:48:00 -06:00
Aaron Skarlupka	e6054a4909	Create README.MD Signed-off-by: aarskar <aaronskarcode@gmail.com>	2019-02-22 14:48:00 -06:00
Aaron Skarlupka	5265049766	Create docker-compose.yml This docker-compose.yml file will create a nextcloud instance with signed certs using the lets encrypt companion and the nginx reverse proxy. Collabora office will also be deployed using signed certs. To use collabora the app must be installed within nextcloud and configured to use office.DOMAIN.TLD. There is no need to specify a port, simply the pubilc domain used to create your certs for the office instance. Ports, 443 and 80 should be forwarded to the server. Signed-off-by: aarskar <aaronskarcode@gmail.com>	2019-02-22 14:48:00 -06:00
 @ -1 +1 @@
 .0.3
 .0.4