aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

feat: optional debugging mode for maintenace:instance + rsync

Browse source 
Signed-off-by: Josh <josh.t.richards@gmail.com>
This commit is contained in:
Josh 2024-10-16 10:15:56 -04:00 • committed by GitHub
parent 0be52642ec
commit fb63647e7e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
docker-entrypoint.sh
View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
set -eu set -eu
if [ -n "${IMAGE_DEBUG+x}" ]; then if [ -n "${IMAGE_DEBUG+x}" ]; then
echo "**Image debugging enabled**" echo "**Image debugging enabled**"
set -x set -x
@ -169,10 +170,14 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
echo "Upgrading nextcloud from $installed_version ..." echo "Upgrading nextcloud from $installed_version ..."
run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before run_as 'php /var/www/html/occ app:list' | sed -n "/Enabled:/,/Disabled:/p" > /tmp/list_before
fi fi
rsync_options=''
if [ -n "${IMAGE_DEBUG+x}" ]; then
rsync_options='-vv'
fi
if [ "$(id -u)" = 0 ]; then if [ "$(id -u)" = 0 ]; then
rsync_options="-rlDog --chown $user:$group" rsync_options="$rsync_options -rlDog --chown $user:$group"
else else
rsync_options="-rlD" rsync_options="$rsync_options -rlD"
fi fi
rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/ rsync $rsync_options --delete --exclude-from=/upgrade.exclude /usr/src/nextcloud/ /var/www/html/
@ -192,8 +197,12 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install=false install=false
if [ -n "${NEXTCLOUD_ADMIN_USER+x}" ] && [ -n "${NEXTCLOUD_ADMIN_PASSWORD+x}" ]; then 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 # shellcheck disable=SC2016
install_options='-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"' install_options=$install_options'-n --admin-user "$NEXTCLOUD_ADMIN_USER" --admin-pass "$NEXTCLOUD_ADMIN_PASSWORD"'
if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then if [ -n "${NEXTCLOUD_DATA_DIR+x}" ]; then
# shellcheck disable=SC2016 # shellcheck disable=SC2016
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
@ -231,9 +240,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
try=0 try=0
until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options" until [ "$try" -gt "$max_retries" ] || run_as "php /var/www/html/occ maintenance:install $install_options"
do do
echo "Retrying install..." echo "Nextcloud installation failed; will retry in 10s..."
try=$((try+1)) try=$((try+1))
sleep 10s sleep 10s
echo "Retrying nextcloud install now... ($try of $max_retries attempts)"
done done
if [ "$try" -gt "$max_retries" ]; then if [ "$try" -gt "$max_retries" ]; then
echo "Installing of nextcloud failed!" echo "Installing of nextcloud failed!"