Merge 2a7d6d8937 into 85eb58a828

Merge pull request #2355 from nextcloud/readme-helm-link
docs(readme): Add community helm chart link
2025-07-22 07:08:06 +02:00 · 2024-12-23 23:37:12 +01:00 · 2024-12-23 16:23:12 +01:00 · 2024-12-23 09:03:54 -05:00 · 2024-11-26 17:01:14 -05:00 · 2024-11-26 14:48:09 -05:00
2 changed files with 6 additions and 3 deletions
--- a/README.md
+++ b/README.md
@ -5,6 +5,7 @@
 ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/nextcloud/docker)
 ![GitHub contributors](https://img.shields.io/github/contributors/nextcloud/docker?label=contributors%20-%20Thank%20you!)
 ![Docker Pulls](https://img.shields.io/docker/pulls/library/nextcloud)
+[![Helm](https://img.shields.io/badge/Helm-0F1689?logo=helm&logoColor=fff)](https://github.com/nextcloud/helm/?tab=readme-ov-file)

 # What is Nextcloud?

--- 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
Author	SHA1	Message	Date
Josh	fd8d1bf73c	Merge `2a7d6d8937` into `85eb58a828`	2024-12-23 23:37:12 +01:00
Kate	85eb58a828	Merge pull request #2355 from nextcloud/readme-helm-link	2024-12-23 16:23:12 +01:00
Josh	d5c6e2ff0e	docs(readme): Add community helm chart link Signed-off-by: Josh <josh.t.richards@gmail.com>	2024-12-23 09:03:54 -05: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