increase to 11.8.0

Signed-off-by: Simon L. <szaimen@e.mail.de>
Merge pull request #6676 from asavageiv/alan/internal-wopi-requests
2026-02-16 02:30:17 +00:00 · 2025-09-05 12:57:57 +02:00 · 2025-09-05 12:49:24 +02:00 · 2025-09-05 12:45:18 +02:00 · 2025-09-05 12:44:48 +02:00 · 2025-09-05 12:44:09 +02:00
8 changed files with 46 additions and 45 deletions
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@ -15,6 +15,7 @@
 }

 https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
+http://{$APACHE_HOST}:{$APACHE_PORT}, # For Collabora callback
 {$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
    header -Server
    header -X-Powered-By
--- a/Containers/fulltextsearch/Dockerfile
+++ b/Containers/fulltextsearch/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Probably from here https://github.com/elastic/elasticsearch/blob/main/distribution/docker/src/docker/Dockerfile
-FROM elasticsearch:8.19.2
+FROM elasticsearch:8.19.3

 USER root

--- a/Containers/mastercontainer/Dockerfile
+++ b/Containers/mastercontainer/Dockerfile
@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # Docker CLI is a requirement
-FROM docker:28.3.3-cli AS docker
+FROM docker:28.4.0-cli AS docker

 # Caddy is a requirement
 FROM caddy:2.10.2-alpine AS caddy
@ -49,7 +49,7 @@ RUN set -ex; \
    apk add --no-cache --virtual .build-deps \
        autoconf \
        build-base; \
-    pecl install APCu-5.1.26; \
+    pecl install APCu-5.1.27; \
    docker-php-ext-enable apcu; \
    rm -r /tmp/pear; \
    runDeps="$( \
--- a/Containers/nextcloud/Dockerfile
+++ b/Containers/nextcloud/Dockerfile
@ -83,7 +83,7 @@ RUN set -ex; \
    \
 # pecl will claim success even if one install fails, so we need to perform each install separately
    pecl install -o igbinary-3.2.16; \
-    pecl install APCu-5.1.26; \
+    pecl install APCu-5.1.27; \
    pecl install -D 'enable-memcached-igbinary="yes"' memcached-3.3.0; \
    pecl install -oD 'enable-redis-igbinary="yes" enable-redis-zstd="yes" enable-redis-lz4="yes"' redis-6.2.0; \
   pecl install -o imagick-3.8.0; \
--- a/Containers/watchtower/Dockerfile
+++ b/Containers/watchtower/Dockerfile
@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM ghcr.io/nicholas-fedor/watchtower:v1.11.7 AS watchtower
+FROM ghcr.io/nicholas-fedor/watchtower:1.11.8 AS watchtower

 FROM alpine:3.22.1

--- a/php/composer.lock
+++ b/php/composer.lock
@ -502,16 +502,16 @@
        },
        {
            "name": "php-di/invoker",
-            "version": "2.3.6",
+            "version": "2.3.7",
            "source": {
                "type": "git",
                "url": "https://github.com/PHP-DI/Invoker.git",
-                "reference": "59f15608528d8a8838d69b422a919fd6b16aa576"
+                "reference": "3c1ddfdef181431fbc4be83378f6d036d59e81e1"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/59f15608528d8a8838d69b422a919fd6b16aa576",
-                "reference": "59f15608528d8a8838d69b422a919fd6b16aa576",
+                "url": "https://api.github.com/repos/PHP-DI/Invoker/zipball/3c1ddfdef181431fbc4be83378f6d036d59e81e1",
+                "reference": "3c1ddfdef181431fbc4be83378f6d036d59e81e1",
                "shasum": ""
            },
            "require": {
@ -521,7 +521,7 @@
            "require-dev": {
                "athletic/athletic": "~0.1.8",
                "mnapoli/hard-mode": "~0.3.0",
-                "phpunit/phpunit": "^9.0"
+                "phpunit/phpunit": "^9.0 || ^10 || ^11 || ^12"
            },
            "type": "library",
            "autoload": {
@ -545,7 +545,7 @@
            ],
            "support": {
                "issues": "https://github.com/PHP-DI/Invoker/issues",
-                "source": "https://github.com/PHP-DI/Invoker/tree/2.3.6"
+                "source": "https://github.com/PHP-DI/Invoker/tree/2.3.7"
            },
            "funding": [
                {
@ -553,7 +553,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-01-17T12:49:27+00:00"
+            "time": "2025-08-30T10:22:22+00:00"
        },
        {
            "name": "php-di/php-di",
@ -1727,16 +1727,16 @@
    "packages-dev": [
        {
            "name": "amphp/amp",
-            "version": "v3.1.0",
+            "version": "v3.1.1",
            "source": {
                "type": "git",
                "url": "https://github.com/amphp/amp.git",
-                "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9"
+                "reference": "fa0ab33a6f47a82929c38d03ca47ebb71086a93f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/amp/zipball/7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9",
-                "reference": "7cf7fef3d667bfe4b2560bc87e67d5387a7bcde9",
+                "url": "https://api.github.com/repos/amphp/amp/zipball/fa0ab33a6f47a82929c38d03ca47ebb71086a93f",
+                "reference": "fa0ab33a6f47a82929c38d03ca47ebb71086a93f",
                "shasum": ""
            },
            "require": {
@ -1796,7 +1796,7 @@
            ],
            "support": {
                "issues": "https://github.com/amphp/amp/issues",
-                "source": "https://github.com/amphp/amp/tree/v3.1.0"
+                "source": "https://github.com/amphp/amp/tree/v3.1.1"
            },
            "funding": [
                {
@ -1804,7 +1804,7 @@
                    "type": "github"
                }
            ],
-            "time": "2025-01-26T16:07:39+00:00"
+            "time": "2025-08-27T21:42:00+00:00"
        },
        {
            "name": "amphp/byte-stream",
@ -2037,16 +2037,16 @@
        },
        {
            "name": "amphp/parallel",
-            "version": "v2.3.1",
+            "version": "v2.3.2",
            "source": {
                "type": "git",
                "url": "https://github.com/amphp/parallel.git",
-                "reference": "5113111de02796a782f5d90767455e7391cca190"
+                "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/amphp/parallel/zipball/5113111de02796a782f5d90767455e7391cca190",
-                "reference": "5113111de02796a782f5d90767455e7391cca190",
+                "url": "https://api.github.com/repos/amphp/parallel/zipball/321b45ae771d9c33a068186b24117e3cd1c48dce",
+                "reference": "321b45ae771d9c33a068186b24117e3cd1c48dce",
                "shasum": ""
            },
            "require": {
@ -2109,7 +2109,7 @@
            ],
            "support": {
                "issues": "https://github.com/amphp/parallel/issues",
-                "source": "https://github.com/amphp/parallel/tree/v2.3.1"
+                "source": "https://github.com/amphp/parallel/tree/v2.3.2"
            },
            "funding": [
                {
@ -2117,7 +2117,7 @@
                    "type": "github"
                }
            ],
-            "time": "2024-12-21T01:56:09+00:00"
+            "time": "2025-08-27T21:55:40+00:00"
        },
        {
            "name": "amphp/parser",
@ -3571,16 +3571,16 @@
        },
        {
            "name": "phpstan/phpdoc-parser",
-            "version": "2.2.0",
+            "version": "2.3.0",
            "source": {
                "type": "git",
                "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8"
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
-                "reference": "b9e61a61e39e02dd90944e9115241c7f7e76bfd8",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/1e0cd5370df5dd2e556a36b9c62f62e555870495",
+                "reference": "1e0cd5370df5dd2e556a36b9c62f62e555870495",
                "shasum": ""
            },
            "require": {
@ -3612,9 +3612,9 @@
            "description": "PHPDoc parser with support for nullable, intersection and generic types",
            "support": {
                "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.2.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.0"
            },
-            "time": "2025-07-13T07:04:09+00:00"
+            "time": "2025-08-30T15:50:23+00:00"
        },
        {
            "name": "revolt/event-loop",
@ -3883,16 +3883,16 @@
        },
        {
            "name": "symfony/console",
-            "version": "v6.4.24",
+            "version": "v6.4.25",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/console.git",
-                "reference": "59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350"
+                "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350",
-                "reference": "59266a5bf6a596e3e0844fd95e6ad7ea3c1d3350",
+                "url": "https://api.github.com/repos/symfony/console/zipball/273fd29ff30ba0a88ca5fb83f7cf1ab69306adae",
+                "reference": "273fd29ff30ba0a88ca5fb83f7cf1ab69306adae",
                "shasum": ""
            },
            "require": {
@ -3957,7 +3957,7 @@
                "terminal"
            ],
            "support": {
-                "source": "https://github.com/symfony/console/tree/v6.4.24"
+                "source": "https://github.com/symfony/console/tree/v6.4.25"
            },
            "funding": [
                {
@ -3977,7 +3977,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-30T10:38:54+00:00"
+            "time": "2025-08-22T10:21:53+00:00"
        },
        {
            "name": "symfony/filesystem",
@ -4449,16 +4449,16 @@
        },
        {
            "name": "symfony/string",
-            "version": "v7.3.2",
+            "version": "v7.3.3",
            "source": {
                "type": "git",
                "url": "https://github.com/symfony/string.git",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca"
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/42f505aff654e62ac7ac2ce21033818297ca89ca",
-                "reference": "42f505aff654e62ac7ac2ce21033818297ca89ca",
+                "url": "https://api.github.com/repos/symfony/string/zipball/17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
+                "reference": "17a426cce5fd1f0901fefa9b2a490d0038fd3c9c",
                "shasum": ""
            },
            "require": {
@ -4516,7 +4516,7 @@
                "utf8"
            ],
            "support": {
-                "source": "https://github.com/symfony/string/tree/v7.3.2"
+                "source": "https://github.com/symfony/string/tree/v7.3.3"
            },
            "funding": [
                {
@ -4536,7 +4536,7 @@
                    "type": "tidelift"
                }
            ],
-            "time": "2025-07-10T08:47:49+00:00"
+            "time": "2025-08-25T06:35:40+00:00"
        },
        {
            "name": "vimeo/psalm",
--- a/php/containers.json
+++ b/php/containers.json
@ -379,7 +379,7 @@
      ],
      "internal_port": "9980",
      "environment": [
-        "aliasgroup1=https://%NC_DOMAIN%:443",
+        "aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache:%APACHE_PORT%",
        "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:logging.level_startup=warning --o:home_mode.enable=true %COLLABORA_SECCOMP_POLICY% --o:remote_font_config.url=https://%NC_DOMAIN%/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+",
        "dictionaries=%COLLABORA_DICTIONARIES%",
        "TZ=%TIMEZONE%",
@ -389,7 +389,7 @@
      "restart": "unless-stopped",
      "nextcloud_exec_commands": [
        "echo 'Activating Collabora config...'",
-        "php /var/www/html/occ richdocuments:activate-config"
+        "php /var/www/html/occ richdocuments:activate-config --wopi-url='http://nextcloud-aio-apache:%APACHE_PORT%' --callback-url='http://nextcloud-aio-apache:%APACHE_PORT%'"
      ],
      "profiles": [
        "collabora"
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@ -17,7 +17,7 @@

    <div class="container">
        <main>
-            <h1>Nextcloud AIO v11.7.0</h1>
+            <h1>Nextcloud AIO v11.8.0</h1>

            {# Add 2nd tab warning #}
            <script type="text/javascript" src="second-tab-warning.js"></script>
Author	SHA1	Message	Date
Simon L.	ca0e7980b3	increase to 11.8.0 Some checks failed Codespell / Check spelling (push) Has been cancelled Details Docker Lint / docker-lint (push) Has been cancelled Details Json Validator / Json Validator (push) Has been cancelled Details Lint php / php-lint (push) Has been cancelled Details PHP Deprecation Detector / PHP Deprecation Detector (push) Has been cancelled Details Static analysis / static-psalm-analysis (push) Has been cancelled Details Twig Lint / twig-lint (push) Has been cancelled Details Lint php / php-lint-summary (push) Has been cancelled Details Signed-off-by: Simon L. <szaimen@e.mail.de>	2025-09-05 12:57:57 +02:00
Simon L.	0521a87999	Merge pull request #6676 from asavageiv/alan/internal-wopi-requests Configure WOPI requests to remain within the Docker network	2025-09-05 12:49:24 +02:00
Simon L.	600f34a58e	Merge pull request #6822 from nextcloud/dependabot/docker/Containers/watchtower/nicholas-fedor/watchtower-1.11.8 build(deps): bump nicholas-fedor/watchtower from v1.11.7 to 1.11.8 in /Containers/watchtower	2025-09-05 12:45:18 +02:00
Simon L.	d9b1a8138e	Merge pull request #6821 from nextcloud/dependabot/docker/Containers/mastercontainer/docker-28.4.0-cli build(deps): bump docker from 28.3.3-cli to 28.4.0-cli in /Containers/mastercontainer	2025-09-05 12:44:48 +02:00
Simon L.	e4f2697eb5	Merge pull request #6819 from nextcloud/dependabot/docker/Containers/fulltextsearch/elasticsearch-8.19.3 build(deps): bump elasticsearch from 8.19.2 to 8.19.3 in /Containers/fulltextsearch	2025-09-05 12:44:09 +02:00
Simon L.	e91fac1722	Merge pull request #6809 from nextcloud/nextcloud-container-update Nextcloud dependency update	2025-09-05 12:43:53 +02:00
Simon L.	06cb79e238	Merge pull request #6808 from nextcloud/aio-dependency-update PHP dependency updates	2025-09-05 12:43:40 +02:00
dependabot[bot]	f5dfa3193c	build(deps): bump nicholas-fedor/watchtower in /Containers/watchtower Bumps [nicholas-fedor/watchtower](https://github.com/nicholas-fedor/watchtower) from v1.11.7 to 1.11.8. - [Release notes](https://github.com/nicholas-fedor/watchtower/releases) - [Commits](https://github.com/nicholas-fedor/watchtower/compare/v1.11.7...v1.11.8) --- updated-dependencies: - dependency-name: nicholas-fedor/watchtower dependency-version: 1.11.8 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-05 04:21:52 +00:00
dependabot[bot]	bccdb62e80	build(deps): bump docker in /Containers/mastercontainer Bumps docker from 28.3.3-cli to 28.4.0-cli. --- updated-dependencies: - dependency-name: docker dependency-version: 28.4.0-cli dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-05 04:21:14 +00:00
Alan Savage	5f4fae140a	Make APACHE_HOST an optional param in apache/Caddyfile Co-authored-by: Simon L. <szaimen@e.mail.de> Signed-off-by: Alan Savage <asavageiv@users.noreply.github.com>	2025-09-04 08:57:40 -07:00
szaimen	b65ee97702	nextcloud-update automated change Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-09-04 12:18:45 +00:00
szaimen	213388b65d	php dependency updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-09-04 12:16:12 +00:00
dependabot[bot]	e255f29818	build(deps): bump elasticsearch in /Containers/fulltextsearch Bumps elasticsearch from 8.19.2 to 8.19.3. --- updated-dependencies: - dependency-name: elasticsearch dependency-version: 8.19.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-03 20:59:02 +00:00
Alan Savage	b26b2b4400	Use nextcloud-aio-apache for the wopi-url This makes all the WOPI requests go through a single point making debugging easier. Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>	2025-08-30 10:24:45 -07:00
Alan Savage	1f7ccba5c8	Configure WOPI requests to remain within the Docker network Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>	2025-08-29 08:27:32 -07:00