Merge pull request #7802 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-25.04.9.4.1

build(deps): bump collabora/code from 25.04.9.3.1 to 25.04.9.4.1 in /Containers/collabora
build(deps): bump collabora/code in /Containers/collabora
2026-05-21 19:00:33 +00:00 · 2026-03-23 08:43:13 +01:00 · 2026-03-23 04:08:55 +00:00 · 2026-03-20 16:06:04 +01:00 · 2026-03-20 16:05:44 +01:00 · 2026-03-20 15:42:54 +01:00
9 changed files with 486 additions and 326 deletions
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@@ -15,7 +15,7 @@
 }

 https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
-http://{$APACHE_HOST}:23973, # For Collabora callback and WOPI requests, see containers.json
+http://{$APACHE_HOST}.nextcloud-aio:23973, # For Collabora callback and WOPI requests, see containers.json
 {$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
    header -Server
    header -X-Powered-By
--- a/Containers/collabora/Dockerfile
+++ b/Containers/collabora/Dockerfile
@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:latest
 # From a file located probably somewhere here: https://github.com/CollaboraOnline/online/blob/master/docker/from-packages/Dockerfile
-FROM collabora/code:25.04.9.3.1
+FROM collabora/code:25.04.9.4.1

 USER root
 ARG DEBIAN_FRONTEND=noninteractive
--- a/Containers/mastercontainer/acme.Caddyfile
+++ b/Containers/mastercontainer/acme.Caddyfile
@@ -17,7 +17,8 @@
 	}

 	servers {
-		protocols h1 h2 h2c
+		# Only h1 is allowed as we prevent `ERR_NETWORK_CHANGED` from happening
+		protocols h1
 	}

 	on_demand_tls {
@@ -39,7 +40,6 @@ https://:8443 {
 	abort @denied

 	root * /var/www/docker-aio/php/public
-	encode
 	php_fastcgi unix//run/php.sock
 	file_server

--- a/Containers/mastercontainer/internal.Caddyfile
+++ b/Containers/mastercontainer/internal.Caddyfile
@@ -13,7 +13,8 @@
 	}

 	servers {
-		protocols h1 h2
+		# Only h1 is allowed as we prevent `ERR_NETWORK_CHANGED` from happening
+		protocols h1
 	}

 	skip_install_trust
@@ -27,7 +28,6 @@ https://:8080 {
 	abort @denied

 	root * /var/www/docker-aio/php/public
-	encode
 	php_fastcgi unix//run/php.sock
 	file_server

--- a/php/containers.json
+++ b/php/containers.json
@@ -379,7 +379,7 @@
      ],
      "internal_port": "9980",
      "environment": [
-        "aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache:23973",
+        "aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache.nextcloud-aio:23973",
        "extra_params=--o:ssl.enable=false --o:ssl.termination=true --o:logging.disable_server_audit=true --o:logging.level=warning --o:logging.level_startup=warning --o:welcome.enable=false --o:fetch_update_check=0 --o:allow_update_popup=false %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 --wopi-url='http://nextcloud-aio-apache:23973' --callback-url='http://nextcloud-aio-apache:23973'"
+        "php /var/www/html/occ richdocuments:activate-config --wopi-url='http://nextcloud-aio-apache.nextcloud-aio:23973' --callback-url='http://nextcloud-aio-apache.nextcloud-aio:23973'"
      ],
      "profiles": [
        "collabora"
--- a/php/templates/containers.twig
+++ b/php/templates/containers.twig
@@ -353,6 +353,9 @@
                                        <input type="hidden" name="{{csrf.keys.name}}" value="{{csrf.name}}">
                                        <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                                        <input id="base_path" type="hidden" name="base_path" value="">
+                                        {% if bypass_container_update == true %}
+                                            <input type="hidden" name="bypass_container_update" value="true">
+                                        {% endif %}
                                        <input type="submit" value="Start containers" />
                                    </form>
                                {% else %}
@@ -361,7 +364,7 @@
                                        <input type="hidden" name="{{csrf.keys.value}}" value="{{csrf.value}}">
                                        <input id="base_path" type="hidden" name="base_path" value="">
                                        {% if bypass_container_update == true %}
-                                            <input type="hidden" name="bypass_container_update" value="{{bypass_container_update}}">
+                                            <input type="hidden" name="bypass_container_update" value="true">
                                        {% endif %}
                                        <input class="button " type="submit" value="Start and update containers" onclick="return confirm('Start and update containers? You should consider creating a backup first.')" />
                                    </form>
--- a/php/tests/tests/initial-setup.spec.js
+++ b/php/tests/tests/initial-setup.spec.js
--- a/php/tests/tests/restore-instance.spec.js
+++ b/php/tests/tests/restore-instance.spec.js
--- a/reverse-proxy.md
+++ b/reverse-proxy.md
Author	SHA1	Message	Date
Simon L.	7c8cabdb2d	Merge pull request #7802 from nextcloud/dependabot/docker/Containers/collabora/collabora/code-25.04.9.4.1 build(deps): bump collabora/code from 25.04.9.3.1 to 25.04.9.4.1 in /Containers/collabora	2026-03-23 08:43:13 +01:00
dependabot[bot]	7049448541	build(deps): bump collabora/code in /Containers/collabora Bumps collabora/code from 25.04.9.3.1 to 25.04.9.4.1. --- updated-dependencies: - dependency-name: collabora/code dependency-version: 25.04.9.4.1 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2026-03-23 04:08:55 +00:00
Simon L.	35dd0a2c00	Merge pull request #7762 from nextcloud/alan/fix-wopi fix collabora not working anymore	2026-03-20 16:06:04 +01:00
Simon L.	fbe60b852c	Merge pull request #7763 from nextcloud/alan/fix-bypass aio-interface: Fix bypass_container_update when not detected as available	2026-03-20 16:05:44 +01:00
Alan Savage	5782a01b7f	Fix bypass_container_update when not detected as available isAnyUpdateAvailable is not necessarily synced with the PullImage logic from DockerActionManager. This ensures no images are pulled regardless of detection. There's also a minor code improvement to avoid unnecessary interpolation. Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>	2026-03-20 15:42:54 +01:00
Alan Savage	46b325f2bd	Workaround #7757 with nextcloud-aio-apache FQDN CollaboraOnline/online/pull/13869 prevents http://nextcloud-aio-apache:23973 from being correctly recognized as a valid URI and thus breaks matching as an authorized WOPI host. This uses http://nextcloud-aio-apache.nextcloud-aio:23973 which is correctly recognized as a valid URI. Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>	2026-03-20 15:42:49 +01:00
Copilot	05f9fa0e25	Fix playwright CI tests broken by Apache→Caddy switch (#7795 ) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: szaimen <42591237+szaimen@users.noreply.github.com>	2026-03-20 15:27:54 +01:00