Merge 2a7d6d8937 into 08ac24880c

Alpine 3.21 (#2360 )
fix: move glob change outside the loop
2025-07-22 07:08:06 +02:00 · 2025-01-10 10:43:11 +01:00 · 2025-01-09 23:01:21 +00:00 · 2024-11-26 17:01:14 -05:00 · 2024-11-26 14:48:09 -05:00
6 changed files with 12 additions and 10 deletions
--- a/28/fpm-alpine/Dockerfile
+++ b/28/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/29/fpm-alpine/Dockerfile
+++ b/29/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/30/fpm-alpine/Dockerfile
+++ b/30/fpm-alpine/Dockerfile
@ -1,5 +1,5 @@
 # DO NOT EDIT: created by update.sh from Dockerfile-alpine.template
-FROM php:8.2-fpm-alpine3.20
+FROM php:8.2-fpm-alpine3.21

 # entrypoint.sh and cron.sh dependencies
 RUN set -ex; \
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@ -237,12 +237,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/update.sh
+++ b/update.sh
@ -2,7 +2,7 @@
 set -eo pipefail

 declare -A alpine_version=(
-	[default]='3.20'
+	[default]='3.21'
 )

 declare -A debian_version=(
--- a/versions.json
+++ b/versions.json
@ -20,7 +20,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
@ -46,7 +46,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
@ -72,7 +72,7 @@
      "fpm-alpine": {
        "variant": "fpm-alpine",
        "base": "alpine",
-        "baseVersion": "3.20",
+        "baseVersion": "3.21",
        "phpVersion": "8.2"
      }
    }
Author	SHA1	Message	Date
Josh	a424f0c078	Merge `2a7d6d8937` into `08ac24880c`	2025-01-10 10:43:11 +01:00
J0WI	08ac24880c	Alpine 3.21 (#2360 )	2025-01-09 23:01:21 +00:00
Josh	2a7d6d8937	fix: move glob change outside the loop Signed-off-by: Josh <josh.t.richards@gmail.com>	2024-11-26 17:01:14 -05:00
Josh	db577ce536	fix: prevent glob expansion on wildcard trusted_domains Signed-off-by: Josh <josh.t.richards@gmail.com>	2024-11-26 14:48:09 -05:00