diff --git a/README.md b/README.md index da0a26f4..d8f41dcb 100644 --- a/README.md +++ b/README.md @@ -631,15 +631,6 @@ docker exec container-name chown -R www-data:root /var/www/html ``` After changing the permissions, restart the container and the permission errors should disappear. - -# Troubleshooting - -The Nextcloud image entrypoint supports a debug (verbose) mode that can be toggled on via an environment variable. This can be used to troubleshoot container start-up, Nextcloud installation, entrypoint changes, etc. - -- `IMAGE_DEBUG=1` - -Note the container log will be highly verbose with this on! - # Help (Questions / Issues) **If you have any questions or problems while using the image, please ask for assistance on the Help Forum first (https://help.nextcloud.com)**. diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh index 9fa58bca..5033d4d0 100755 --- a/docker-entrypoint.sh +++ b/docker-entrypoint.sh @@ -1,6 +1,5 @@ #!/bin/sh set -eu - if [ -n "${IMAGE_DEBUG+x}" ]; then echo "**Image debugging enabled**" set -x @@ -170,14 +169,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP echo "Upgrading nextcloud from $installed_version ..." run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before fi - rsync_options='' - if [ -n "${IMAGE_DEBUG+x}" ]; then - rsync_options='-vv' - fi if [ "$(id -u)" = 0 ]; then - rsync_options="$rsync_options -rlDog --chown $user:$group" + rsync_options="-rlDog --chown $user:$group" else - rsync_options="$rsync_options -rlD" + rsync_options="-rlD" fi rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/ @@ -197,12 +192,8 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP install=false if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then - install_options='' - if [ -n "${IMAGE_DEBUG+x}" ]; then - install_options='-v ' - fi # shellcheck disable=SC2016 - install_options=$install_options'-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"' + install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"' if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then # shellcheck disable=SC2016 install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' @@ -240,10 +231,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP try=0 until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" do - echo "Nextcloud installation failed; will retry in 10s..." + echo "Retrying install..." try=$((try+1)) sleep 10s - echo "Retrying nextcloud install now... ($try of $max_retries attempts)" done if [ "$try" -gt "$max_retries" ]; then echo "Installing of nextcloud failed!"