watchtower-update automated change

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

Containers/nextcloud/config/aio.config.php

@@ -2,5 +2,4 @@
 $CONFIG = array (
   'one-click-instance' => true,
   'one-click-instance.user-limit' => 100,
-  'update_channel' => 'stable',
 );

Containers/nextcloud/config/server.config.php

@@ -1,4 +1,4 @@
 <?php
 $CONFIG = array (
-  'serverid' => crc32(gethostname()) % 512,
+  'serverid' => hexdec(hash('xxh32', gethostname()) & 0x1FF,
 );

Containers/nextcloud/entrypoint.sh

@@ -419,12 +419,41 @@ EOF
 
 # AIO update to latest start # Do not remove or change this line!
             if [ "$INSTALL_LATEST_MAJOR" = yes ]; then
-                if ! bash /upgrade-latest-major.sh; then
-                    echo "Upgrade to latest major version failed! Check the output above for details."
+                php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
+                INSTALLED_AT="$(php /var/www/html/occ config:app:get core installedat)"
+                if [ -n "${INSTALLED_AT}" ]; then
+                    # Set the installdat to 00 which will allow to skip staging and install the next major directly
+                    # shellcheck disable=SC2001
+                    INSTALLED_AT="$(echo "${INSTALLED_AT}" | sed "s|[0-9][0-9]$|00|")"
+                    php /var/www/html/occ config:app:set core installedat --value="${INSTALLED_AT}" 
+                fi
+                php /var/www/html/updater/updater.phar --no-interaction --no-backup
+                if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
+                    echo "Installation of Nextcloud failed!"
+                    touch "$NEXTCLOUD_DATA_DIR/install.failed"
                     exit 1
                 fi
                 # shellcheck disable=SC2016
                 installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
+                INSTALLED_MAJOR="${installed_version%%.*}"
+                IMAGE_MAJOR="${image_version%%.*}"
+                # If a valid upgrade path, trigger the Nextcloud built-in Updater
+                if ! [ "$INSTALLED_MAJOR" -gt "$IMAGE_MAJOR" ]; then
+                    php /var/www/html/updater/updater.phar --no-interaction --no-backup
+                    if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
+                        echo "Installation of Nextcloud failed!"
+                        # TODO: Add a hint here about what to do / where to look / updater.log? 
+                        touch "$NEXTCLOUD_DATA_DIR/install.failed"
+                        exit 1
+                    fi
+                    # shellcheck disable=SC2016
+                    installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
+                fi
+                php /var/www/html/occ config:system:set updatechecker --type=bool --value=true
+                php /var/www/html/occ app:enable nextcloud-aio --force
+                php /var/www/html/occ db:add-missing-columns
+                php /var/www/html/occ db:add-missing-primary-keys
+                yes | php /var/www/html/occ db:convert-filecache-bigint
             fi
 # AIO update to latest end # Do not remove or change this line!
 

Containers/nextcloud/upgrade-latest-major.sh

@@ -1,38 +0,0 @@
-#!/bin/bash
-
-# shellcheck disable=SC2016
-image_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
-IMAGE_MAJOR="${image_version%%.*}"
-
-php /var/www/html/occ config:system:set updatedirectory --value="/nc-updater"
-INSTALLED_AT="$(php /var/www/html/occ config:app:get core installedat)"
-if [ -n "${INSTALLED_AT}" ]; then
-    # Set the installedat to 00 which will allow to skip staging and install the next major directly
-    # shellcheck disable=SC2001
-    INSTALLED_AT="$(echo "${INSTALLED_AT}" | sed "s|[0-9][0-9]$|00|")"
-    php /var/www/html/occ config:app:set core installedat --value="${INSTALLED_AT}"
-fi
-php /var/www/html/updater/updater.phar --no-interaction --no-backup
-if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
-    echo "Installation of Nextcloud failed!"
-    touch "$NEXTCLOUD_DATA_DIR/install.failed"
-    exit 1
-fi
-# shellcheck disable=SC2016
-installed_version="$(php -r 'require "/var/www/html/version.php"; echo implode(".", $OC_Version);')"
-INSTALLED_MAJOR="${installed_version%%.*}"
-# If a valid upgrade path, trigger the Nextcloud built-in Updater
-if ! [ "$INSTALLED_MAJOR" -gt "$IMAGE_MAJOR" ]; then
-    php /var/www/html/updater/updater.phar --no-interaction --no-backup
-    if ! php /var/www/html/occ -V || php /var/www/html/occ status | grep maintenance | grep -q 'true'; then
-        echo "Installation of Nextcloud failed!"
-        # TODO: Add a hint here about what to do / where to look / updater.log?
-        touch "$NEXTCLOUD_DATA_DIR/install.failed"
-        exit 1
-    fi
-fi
-php /var/www/html/occ config:system:set updatechecker --type=bool --value=true
-php /var/www/html/occ app:enable nextcloud-aio --force
-php /var/www/html/occ db:add-missing-columns
-php /var/www/html/occ db:add-missing-primary-keys
-yes | php /var/www/html/occ db:convert-filecache-bigint

Containers/notify-push/start.sh

@@ -42,6 +42,15 @@ if ! [ -f /var/www/html/custom_apps/notify_push/bin/"$CPU_ARCH"/notify_push ] &&
     exit 1
 fi
 
+# Logic for ipv6 disabled servers
+BIND="::"
+if grep -q "1" /sys/module/ipv6/parameters/disable \
+|| grep -q "1" /proc/sys/net/ipv6/conf/all/disable_ipv6 \
+|| grep -q "1" /proc/sys/net/ipv6/conf/default/disable_ipv6; then
+    BIND="0.0.0.0"
+fi
+export BIND
+
 echo "notify-push was started"
 
 

Containers/watchtower/Dockerfile

@@ -1,13 +1,13 @@
 # syntax=docker/dockerfile:latest
 FROM golang:1.26.3-alpine3.23 AS go
 
-ENV WATCHTOWER_COMMIT_HASH=652c89577076f6bc6f2af4465217589641216ee3	
+ENV WATCHTOWER_COMMIT_HASH=14c318d05a529c59f6b48a8cc3633527ec6770af	
 
 RUN set -ex; \
     apk upgrade --no-cache -a; \
     apk add --no-cache \
         build-base; \
-    go install github.com/nicholas-fedor/watchtower@$WATCHTOWER_COMMIT_HASH # v1.16.1
+    go install github.com/nicholas-fedor/watchtower@$WATCHTOWER_COMMIT_HASH # v1.17.1
 
 FROM alpine:3.23.4
 

php/public/index.php

@@ -104,7 +104,6 @@ $app->post('/api/docker/backup-test', AIO\Controller\DockerController::class . '
 $app->post('/api/docker/restore', AIO\Controller\DockerController::class . ':StartBackupContainerRestore');
 $app->post('/api/docker/stop', AIO\Controller\DockerController::class . ':StopContainer');
 $app->post('/api/docker/backup-reset-location', AIO\Controller\DockerController::class . ':DeleteBorgBackupConfig');
-$app->post('/api/docker/nextcloud-upgrade-to-latest-major', AIO\Controller\DockerController::class . ':RunNextcloudUpgradeToLatestMajor');
 $app->post('/api/docker/prune', AIO\Controller\DockerController::class . ':SystemPrune');
 $app->get('/api/docker/logs', AIO\Controller\DockerController::class . ':GetLogs');
 $app->post('/api/auth/login', AIO\Controller\LoginController::class . ':TryLogin');

php/src/Controller/DockerController.php

@@ -14,7 +14,6 @@ use Slim\Psr7\NonBufferedBody;
 
 readonly class DockerController {
     private const string TOP_CONTAINER = 'nextcloud-aio-apache';
-    private const string LATEST_MAJOR_VERSION = '33';
 
     public function __construct(
         private DockerActionManager           $dockerActionManager,
@@ -222,7 +221,7 @@ readonly class DockerController {
         }
 
         if (isset($request->getParsedBody()['install_latest_major'])) {
-            $installLatestMajor = self::LATEST_MAJOR_VERSION;
+            $installLatestMajor = '33';
         } else {
             $installLatestMajor = '';
         }
@@ -334,20 +333,6 @@ readonly class DockerController {
         return $response->withStatus(201)->withHeader('Location', '.');
     }
 
-    public function RunNextcloudUpgradeToLatestMajor(Request $request, Response $response, array $args) : Response {
-        $this->configurationManager->installLatestMajor = self::LATEST_MAJOR_VERSION;
-
-        // Get streaming response start and closure
-        $nonbufResp = $this->startStreamingResponse($response);
-        $addToStreamingResponseBody = $this->getPlainStreamingCallback($nonbufResp);
-
-        $this->dockerActionManager->RunNextcloudUpgradeToLatestMajor($addToStreamingResponseBody);
-
-        // End streaming response
-        $this->finalizeStreamingResponse($nonbufResp);
-        return $nonbufResp;
-    }
-
     public function SystemPrune(Request $request, Response $response, array $args) : Response {
         // Get streaming response start and closure
         $nonbufResp = $this->startStreamingResponse($response);
@@ -445,18 +430,12 @@ readonly class DockerController {
         // if it'll actually pull an image), but which should not need to know anything about the
         // wanted markup or formatting.
         $addToStreamingResponseBody = function (Container $container, string $message) use ($nonbufResp) : void {
-            $nonbufResp->getBody()->write("<div>" . htmlspecialchars("{$container->displayName}: {$message}", ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</div>");
+            $nonbufResp->getBody()->write("<div>{$container->displayName}: {$message}</div>");
         };
 
         return $addToStreamingResponseBody;
     }
 
-    private function getPlainStreamingCallback(Response $nonbufResp) : \Closure {
-        return function (string $message) use ($nonbufResp) : void {
-            $nonbufResp->getBody()->write("<div>" . htmlspecialchars($message, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</div>");
-        };
-    }
-
     private function finalizeStreamingResponse(Response $nonbufResp) : void {
         $nonbufResp->getBody()->write($this->getStreamingResponseHtmlEnd());
     }

php/src/Docker/DockerActionManager.php

@@ -761,79 +761,48 @@ readonly class DockerActionManager {
     }
 
     public function sendNotification(Container $container, string $subject, string $message, string $file = '/notify.sh'): void {
-        $this->execCommandInContainer($container, ['bash', $file, $subject, $message]);
-    }
+        if ($this->GetContainerStartingState($container) === ContainerState::Running) {
 
-    public function execCommandInContainer(Container $container, array $cmd, ?\Closure $outputCallback = null): void {
-        if ($cmd === []) {
-            throw new \InvalidArgumentException('$cmd must not be empty.');
-        }
-        foreach ($cmd as $arg) {
-            if (!is_string($arg) || $arg === '') {
-                throw new \InvalidArgumentException('Every element of $cmd must be a non-empty string.');
-            }
-        }
+            $containerName = $container->identifier;
 
-        if ($this->GetContainerStartingState($container) !== ContainerState::Running) {
-            return;
-        }
+            // schedule the exec
+            $url = $this->BuildApiUrl(sprintf('containers/%s/exec', urlencode($containerName)));
+            $response = json_decode(
+                $this->guzzleClient->request(
+                    'POST',
+                    $url,
+                    [
+                        'json' => [
+                            'AttachStdout' => true,
+                            'Tty' => true,
+                            'Cmd' => [
+                                'bash',
+                                $file,
+                                $subject,
+                                $message
+                            ],
+                        ],
+                    ]
+                )->getBody()->getContents(),
+                true,
+                512, 
+                JSON_THROW_ON_ERROR,
+            );
 
-        $containerName = $container->identifier;
+            $id = $response['Id'];
 
-        // Create exec instance
-        $url = $this->BuildApiUrl(sprintf('containers/%s/exec', urlencode($containerName)));
-        $response = json_decode(
+            // start the exec
+            $url = $this->BuildApiUrl(sprintf('exec/%s/start', $id));
             $this->guzzleClient->request(
                 'POST',
                 $url,
                 [
                     'json' => [
-                        'AttachStdout' => true,
-                        'AttachStderr' => true,
+                        'Detach' => false,
                         'Tty' => true,
-                        'Cmd' => $cmd,
                     ],
                 ]
-            )->getBody()->getContents(),
-            true,
-            512,
-            JSON_THROW_ON_ERROR,
-        );
-
-        $execId = $response['Id'];
-
-        // Start exec
-        $url = $this->BuildApiUrl(sprintf('exec/%s/start', $execId));
-        $requestOptions = [
-            'json' => [
-                'Detach' => false,
-                'Tty' => true,
-            ],
-        ];
-        if ($outputCallback !== null) {
-            $requestOptions['stream'] = true;
-        }
-
-        $startResponse = $this->guzzleClient->request('POST', $url, $requestOptions);
-
-        if ($outputCallback !== null) {
-            $body = $startResponse->getBody();
-            $buffer = '';
-            while (!$body->eof()) {
-                $chunk = $body->read(1024);
-                $buffer .= $chunk;
-                while (($pos = strpos($buffer, "\n")) !== false) {
-                    $line = substr($buffer, 0, $pos);
-                    $buffer = substr($buffer, $pos + 1);
-                    $line = rtrim($line, "\r");
-                    if ($line !== '') {
-                        $outputCallback($line);
-                    }
-                }
-            }
-            if (trim($buffer) !== '') {
-                $outputCallback(trim($buffer));
-            }
+            );
         }
     }
 
@@ -1058,11 +1027,6 @@ readonly class DockerActionManager {
         }
     }
 
-    public function RunNextcloudUpgradeToLatestMajor(\Closure $addToStreamingResponseBody): void {
-        $container = $this->containerDefinitionFetcher->GetContainerById('nextcloud-aio-nextcloud');
-        $this->execCommandInContainer($container, ['bash', '/upgrade-latest-major.sh'], $addToStreamingResponseBody);
-    }
-
     public function SystemPrune(?\Closure $addToStreamingResponseBody = null): void {
         $endpoints = [
             // Remove stopped containers

php/templates/containers.twig

@@ -298,12 +298,7 @@
                                 {% if newMajorVersionString != '' and isAnyRunning == true and isApacheStarting != true %}
                                     <details>
                                     <summary>Note about <strong>Nextcloud Hub {{ newMajorVersionString }}</strong></summary>
-<p>If you haven't upgraded to Nextcloud Hub {{ newMajorVersionString }} yet and want to do that now, feel free to click the button below. ⚠️ Warning: make sure to create a backup before clicking the button as the update can go wrong and will leave your instance in a broken state!</p>
-                                        <form method="POST" action="api/docker/nextcloud-upgrade-to-latest-major" target="overlay-log">
-                                            <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
-                                            <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
-                                            <input type="submit" value="Upgrade to Nextcloud Hub {{ newMajorVersionString }}" data-confirm="Upgrade to Nextcloud Hub {{ newMajorVersionString }}? You should consider creating a backup first." />
-                                        </form>
+                                        <p>If you haven't upgraded to Nextcloud Hub {{ newMajorVersionString }} yet and want to do that now, feel free to follow <strong><a target="_blank" href="https://github.com/nextcloud/all-in-one/discussions/7523">this documentation</a></strong></p>
                                     </details>
                                 {% endif %}
                             {% endif %}