From 4f071a6f44024efcd59b362c270080f50f69abf3 Mon Sep 17 00:00:00 2001 From: GitHub Workflow Date: Thu, 28 Apr 2022 18:32:56 +0000 Subject: [PATCH] Runs update.sh --- 22/apache/entrypoint.sh | 7 ++++++- 22/fpm-alpine/entrypoint.sh | 7 ++++++- 22/fpm/entrypoint.sh | 7 ++++++- 23/apache/entrypoint.sh | 7 ++++++- 23/fpm-alpine/entrypoint.sh | 7 ++++++- 23/fpm/entrypoint.sh | 7 ++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/22/apache/entrypoint.sh b/22/apache/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/22/apache/entrypoint.sh +++ b/22/apache/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously diff --git a/22/fpm-alpine/entrypoint.sh b/22/fpm-alpine/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/22/fpm-alpine/entrypoint.sh +++ b/22/fpm-alpine/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously diff --git a/22/fpm/entrypoint.sh b/22/fpm/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/22/fpm/entrypoint.sh +++ b/22/fpm/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously diff --git a/23/apache/entrypoint.sh b/23/apache/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/23/apache/entrypoint.sh +++ b/23/apache/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously diff --git a/23/fpm-alpine/entrypoint.sh b/23/fpm-alpine/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/23/fpm-alpine/entrypoint.sh +++ b/23/fpm-alpine/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously diff --git a/23/fpm/entrypoint.sh b/23/fpm/entrypoint.sh index 413ae9c6..6c8f35f4 100755 --- a/23/fpm/entrypoint.sh +++ b/23/fpm/entrypoint.sh @@ -106,15 +106,20 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP # it to be done, then escape initalization lock=/var/www/html/nextcloud-init-sync.lock count=0 + limit=10 if [ -f "$lock" ]; then - until [ ! -f "$lock" ] + until [ ! -f "$lock" ] || [ "$count" -gt "$limit" ] do count=$((count+1)) wait=$((count*10)) echo "Another process is initializing Nextcloud. Waiting $wait seconds..." sleep $wait done + if [ "$count" -gt "$limit" ]; then + echo "Timeout while waiting for an ongoing initialization" + exit 1 + fi echo "The other process is done, assuming complete initialization" else # Prevent multiple images syncing simultaneously