From 87339c73fc177e1987ba7c701b57adc60c42f75e Mon Sep 17 00:00:00 2001 From: Aakash788 Date: Fri, 5 Jul 2024 21:10:51 +0530 Subject: [PATCH] Fixed issue #1708 Signed-off-by: Aakash788 --- Dockerfile-alpine.template | 2 -- docker-entrypoint.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 6ea00644..de69eef2 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -41,8 +41,6 @@ RUN set -ex; \ pcre-dev \ postgresql-dev \ ; \ - # Install diffutils to address diff dependencies issue - apk add --no-cache diffutils; \ \ docker-php-ext-configure ftp --with-openssl-dir=/usr; \ docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp; \ diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 1c60984c..4e06fcc4 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -225,7 +225,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "Starting nextcloud installation" max_retries=10 try=0 - until run_as "php /var/www/html/occ maintenance:install $install_options" || [ "$try" -gt "$max_retries" ] + until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" do echo "Retrying install..." try=$((try+1))