From d89def24d197f86bbd3c0e209dd4627e96740c53 Mon Sep 17 00:00:00 2001 From: Yevhen Kolomeiko Date: Wed, 10 Jan 2024 00:31:39 +0200 Subject: [PATCH 1/4] Fix for PR #2095 breaking post-installation scripts in k8s (#2115) * Fix docker-entrypoint.sh Signed-off-by: Yevhen Kolomeiko * Fix docker-entrypoint.sh for alpine Signed-off-by: Yevhen Kolomeiko * Use '-o' instead of two find's in docker-entrypoint.sh Signed-off-by: Yevhen Kolomeiko * Use more laconic find parameters set in docker-entrypoint.sh Signed-off-by: Yevhen Kolomeiko --------- Signed-off-by: Yevhen Kolomeiko --- docker-entrypoint.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index edb539a0..5b627f07 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue From 28a76ceba469acb1267e35d8e6c9bd389ef9d186 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Tue, 9 Jan 2024 22:31:54 +0000 Subject: [PATCH 2/4] Runs update.sh --- 26/apache/entrypoint.sh | 2 +- 26/fpm-alpine/entrypoint.sh | 2 +- 26/fpm/entrypoint.sh | 2 +- 27/apache/entrypoint.sh | 2 +- 27/fpm-alpine/entrypoint.sh | 2 +- 27/fpm/entrypoint.sh | 2 +- 28/apache/entrypoint.sh | 2 +- 28/fpm-alpine/entrypoint.sh | 2 +- 28/fpm/entrypoint.sh | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/26/apache/entrypoint.sh b/26/apache/entrypoint.sh index edb539a0..5b627f07 100755 --- a/26/apache/entrypoint.sh +++ b/26/apache/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/26/fpm-alpine/entrypoint.sh b/26/fpm-alpine/entrypoint.sh index edb539a0..5b627f07 100755 --- a/26/fpm-alpine/entrypoint.sh +++ b/26/fpm-alpine/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/26/fpm/entrypoint.sh b/26/fpm/entrypoint.sh index edb539a0..5b627f07 100755 --- a/26/fpm/entrypoint.sh +++ b/26/fpm/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/27/apache/entrypoint.sh b/27/apache/entrypoint.sh index edb539a0..5b627f07 100755 --- a/27/apache/entrypoint.sh +++ b/27/apache/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/27/fpm-alpine/entrypoint.sh b/27/fpm-alpine/entrypoint.sh index edb539a0..5b627f07 100755 --- a/27/fpm-alpine/entrypoint.sh +++ b/27/fpm-alpine/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/27/fpm/entrypoint.sh b/27/fpm/entrypoint.sh index edb539a0..5b627f07 100755 --- a/27/fpm/entrypoint.sh +++ b/27/fpm/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/28/apache/entrypoint.sh b/28/apache/entrypoint.sh index edb539a0..5b627f07 100755 --- a/28/apache/entrypoint.sh +++ b/28/apache/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/28/fpm-alpine/entrypoint.sh b/28/fpm-alpine/entrypoint.sh index edb539a0..5b627f07 100755 --- a/28/fpm-alpine/entrypoint.sh +++ b/28/fpm-alpine/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue diff --git a/28/fpm/entrypoint.sh b/28/fpm/entrypoint.sh index edb539a0..5b627f07 100755 --- a/28/fpm/entrypoint.sh +++ b/28/fpm/entrypoint.sh @@ -32,7 +32,7 @@ run_path() { echo "=> Searching for scripts (*.sh) to run, located in the folder: ${hook_folder_path}" ( - find "${hook_folder_path}" -type f -maxdepth 1 -iname '*.sh' -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" continue From 071b888f7f689caa62c1498b6c61cb3599bcea2b Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 9 Jan 2024 23:04:18 +0000 Subject: [PATCH 3/4] Update logo (#2143) --- logo.svg | 110 +------------------------------------------------------ 1 file changed, 1 insertion(+), 109 deletions(-) diff --git a/logo.svg b/logo.svg index 80d546e7..7d4003de 100644 --- a/logo.svg +++ b/logo.svg @@ -1,109 +1 @@ - - - -image/svg+xml \ No newline at end of file + \ No newline at end of file From bbc81a94b7b89b044ccaed7c535e5bd3ec17ef55 Mon Sep 17 00:00:00 2001 From: J0WI Date: Tue, 9 Jan 2024 23:12:44 +0000 Subject: [PATCH 4/4] Update logo in README.md Signed-off-by: J0WI --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a4592d70..f82aae2d 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ A safe home for all your data. Access & share your files, calendars, contacts, mail & more from any device, on your terms. -![logo](https://cdn.rawgit.com/nextcloud/docker/80dd587d847b184ba95d7187a2a7a56ae4cbbb7b/logo.svg) +![logo](https://cdn.rawgit.com/nextcloud/docker/071b888f7f689caa62c1498b6c61cb3599bcea2b/logo.svg) This Docker micro-service image is developed and maintained by the Nextcloud community. Nextcloud GmbH does not offer support for this Docker image. When you are looking to get professional support, you can become an [enterprise](https://nextcloud.com/enterprise/) customer or use [Nextcloud All-in-One docker image](https://github.com/nextcloud/all-in-one#nextcloud-all-in-one) - as the name suggests, Nextcloud All-in-One provides easy deployment and maintenance of Nextcloud Hub included in this one Nextcloud instance.