1.50.1.sh: Remove docker related codefix/docker-php-upgrade

update.sh: Disable nc-update for docker

Signed-off-by: thecalcaholic <6317548+theCalcaholic@users.noreply.github.com>

3 files changed, 6 insertions, 41 deletions

diff --git a/build/docker/nextcloudpi/000ncp b/build/docker/nextcloudpi/000ncp
index 4739125e..d6f6016f 100755
--- a/build/docker/nextcloudpi/000ncp
+++ b/build/docker/nextcloudpi/000ncp
@@ -22,4 +22,7 @@ persistent_cfg /etc/cron.weekly
 }
 persistent_cfg /usr/local/bin /data/bin
 
+touch /var/log/ncp.log
+tail -f -n0 /data/nextcloud/data/nextcloud.log &
+
 exit 0
diff --git a/update.sh b/update.sh
index ff1d816b..bbf2aa21 100755
--- a/update.sh
+++ b/update.sh
@@ -18,6 +18,7 @@ UPDATESDIR=updates
 # don't make sense in a docker container
 EXCL_DOCKER="
 nc-autoupdate-ncp
+nc-update
 nc-automount
 nc-format-USB
 nc-datadir
diff --git a/updates/1.50.1.sh b/updates/1.50.1.sh
index 39726f2e..645f184a 100644
--- a/updates/1.50.1.sh
+++ b/updates/1.50.1.sh
@@ -6,44 +6,5 @@ source /usr/local/etc/library.sh
 
 install_template systemd/notify_push.service.sh /etc/systemd/system/notify_push.service
 
-if is_docker
-then
-
-  echo "Upgrading PHP..."
-  export DEBIAN_FRONTEND=noninteractive
-  PHPVER_OLD="7.4"
-  PHPVER_NEW="8.1"
-
-  php_restore() {
-    trap "" INT TERM HUP ERR
-    echo "Something went wrong while upgrading PHP. Rolling back..."
-    set +e
-    a2disconf php${PHPVER_NEW}-fpm
-    set_ncpcfg "php_version" "${PHPVER_OLD}"
-    install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_OLD}/mods-available/opcache.ini"
-    clear_opcache
-    run_app nc-limits
-    a2enconf "php${PHPVER_OLD}-fpm"
-    service "php${PHPVER_OLD}-fpm" start
-    service apache2 restart
-    echo "PHP upgrade has been reverted. Please downgrade to the previous docker image"
-  }
-
-  trap php_restore INT TERM HUP ERR
-
-  # Setup apt repository for php 8
-
-  a2disconf "php${PHPVER_OLD}-fpm"
-  set_ncpcfg "php_version" "${PHPVER_NEW}"
-  install_template "php/opcache.ini.sh" "/etc/php/${PHPVER_NEW}/mods-available/opcache.ini"
-  ( set -e; export PHPVER="${PHPVER_NEW}"; run_app nc-limits )
-  clear_opcache
-  a2enconf "php${PHPVER_NEW}-fpm"
-  service "php${PHPVER_NEW}-fpm" start
-  service apache2 restart
-
-else
-
-  clear_opcache
-  bash -c "sleep 6; service php${PHPVER}-fpm restart" &>/dev/null &
-fi
+clear_opcache
+bash -c "sleep 6; service php${PHPVER}-fpm restart" &>/dev/null &