From 1716d95ad54d714c5f53146fa811d61d05cdb425 Mon Sep 17 00:00:00 2001 From: Tilo Spannagel Date: Thu, 8 Oct 2020 17:34:40 +0200 Subject: [PATCH 1/4] Update stable channel to 19.0.4 Signed-off-by: Julien <4344970+julien235@users.noreply.github.com> --- generate-stackbrew-library.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh index d6bf9aab..b5a7e1e2 100755 --- a/generate-stackbrew-library.sh +++ b/generate-stackbrew-library.sh @@ -1,7 +1,7 @@ #!/bin/bash set -Eeuo pipefail -stable_channel='19.0.3' +stable_channel='19.0.4' self="$(basename "$BASH_SOURCE")" cd "$(dirname "$(readlink -f "$BASH_SOURCE")")" From 36d9261ff0a68dd66d90e230f1386bdeb62d7198 Mon Sep 17 00:00:00 2001 From: Julien <4344970+julien235@users.noreply.github.com> Date: Sat, 10 Oct 2020 19:55:26 +0200 Subject: [PATCH 2/4] add export NEXTCLOUD_TRUSTED_DOMAINS Signed-off-by: Julien <4344970+julien235@users.noreply.github.com> --- docker-entrypoint.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." From a783c8d3c0adc2bd8e1d4e543c9722c498c1d80e Mon Sep 17 00:00:00 2001 From: Julien Date: Sat, 10 Oct 2020 18:50:19 +0200 Subject: [PATCH 3/4] add export NEXTCLOUD_TRUSTED_DOMAINS Signed-off-by: Julien <4344970+julien235@users.noreply.github.com> --- 20.0/apache/entrypoint.sh | 3 +++ 20.0/fpm-alpine/entrypoint.sh | 3 +++ 20.0/fpm/entrypoint.sh | 3 +++ 3 files changed, 9 insertions(+) diff --git a/20.0/apache/entrypoint.sh b/20.0/apache/entrypoint.sh index b9ec5fc5..037d3b9f 100755 --- a/20.0/apache/entrypoint.sh +++ b/20.0/apache/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/20.0/fpm-alpine/entrypoint.sh b/20.0/fpm-alpine/entrypoint.sh index b9ec5fc5..037d3b9f 100755 --- a/20.0/fpm-alpine/entrypoint.sh +++ b/20.0/fpm-alpine/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/20.0/fpm/entrypoint.sh b/20.0/fpm/entrypoint.sh index b9ec5fc5..6cd32140 100755 --- a/20.0/fpm/entrypoint.sh +++ b/20.0/fpm/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." From 20cf39e58118e133e0ef06e95f2e68488c5b3368 Mon Sep 17 00:00:00 2001 From: Julien <4344970+julien235@users.noreply.github.com> Date: Sat, 10 Oct 2020 20:02:45 +0200 Subject: [PATCH 4/4] run update.sh Signed-off-by: Julien <4344970+julien235@users.noreply.github.com> --- 17.0/apache/entrypoint.sh | 3 +++ 17.0/fpm-alpine/entrypoint.sh | 3 +++ 17.0/fpm/entrypoint.sh | 3 +++ 18.0/apache/entrypoint.sh | 3 +++ 18.0/fpm-alpine/entrypoint.sh | 3 +++ 18.0/fpm/entrypoint.sh | 3 +++ 19.0/apache/entrypoint.sh | 3 +++ 19.0/fpm-alpine/entrypoint.sh | 3 +++ 19.0/fpm/entrypoint.sh | 3 +++ 20.0/apache/entrypoint.sh | 2 +- 20.0/fpm-alpine/entrypoint.sh | 2 +- 20.0/fpm/entrypoint.sh | 4 ++-- 12 files changed, 31 insertions(+), 4 deletions(-) diff --git a/17.0/apache/entrypoint.sh b/17.0/apache/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/17.0/apache/entrypoint.sh +++ b/17.0/apache/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/17.0/fpm-alpine/entrypoint.sh b/17.0/fpm-alpine/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/17.0/fpm-alpine/entrypoint.sh +++ b/17.0/fpm-alpine/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/17.0/fpm/entrypoint.sh b/17.0/fpm/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/17.0/fpm/entrypoint.sh +++ b/17.0/fpm/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/18.0/apache/entrypoint.sh b/18.0/apache/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/18.0/apache/entrypoint.sh +++ b/18.0/apache/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/18.0/fpm-alpine/entrypoint.sh b/18.0/fpm-alpine/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/18.0/fpm-alpine/entrypoint.sh +++ b/18.0/fpm-alpine/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/18.0/fpm/entrypoint.sh b/18.0/fpm/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/18.0/fpm/entrypoint.sh +++ b/18.0/fpm/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/19.0/apache/entrypoint.sh b/19.0/apache/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/19.0/apache/entrypoint.sh +++ b/19.0/apache/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/19.0/fpm-alpine/entrypoint.sh b/19.0/fpm-alpine/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/19.0/fpm-alpine/entrypoint.sh +++ b/19.0/fpm-alpine/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/19.0/fpm/entrypoint.sh b/19.0/fpm/entrypoint.sh index b9ec5fc5..29878c9b 100755 --- a/19.0/fpm/entrypoint.sh +++ b/19.0/fpm/entrypoint.sh @@ -149,6 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 + + file_env NEXTCLOUD_TRUSTED_DOMAINS + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/20.0/apache/entrypoint.sh b/20.0/apache/entrypoint.sh index 037d3b9f..29878c9b 100755 --- a/20.0/apache/entrypoint.sh +++ b/20.0/apache/entrypoint.sh @@ -151,7 +151,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP try=0 file_env NEXTCLOUD_TRUSTED_DOMAINS - + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/20.0/fpm-alpine/entrypoint.sh b/20.0/fpm-alpine/entrypoint.sh index 037d3b9f..29878c9b 100755 --- a/20.0/fpm-alpine/entrypoint.sh +++ b/20.0/fpm-alpine/entrypoint.sh @@ -151,7 +151,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP try=0 file_env NEXTCLOUD_TRUSTED_DOMAINS - + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..." diff --git a/20.0/fpm/entrypoint.sh b/20.0/fpm/entrypoint.sh index 6cd32140..29878c9b 100755 --- a/20.0/fpm/entrypoint.sh +++ b/20.0/fpm/entrypoint.sh @@ -149,9 +149,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "starting nextcloud installation" max_retries=10 try=0 - + file_env NEXTCLOUD_TRUSTED_DOMAINS - + until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] do echo "retrying install..."