Yaml updates

Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Merge pull request #6825 from nextcloud/alan/fix-wopi-serving
2026-02-16 02:30:17 +00:00 · 2025-09-08 09:48:12 +00:00 · 2025-09-08 11:42:45 +02:00 · 2025-09-08 10:08:02 +02:00 · 2025-09-08 04:30:50 +00:00 · 2025-09-05 06:18:18 -07:00
4 changed files with 5 additions and 5 deletions
--- a/Containers/apache/Caddyfile
+++ b/Containers/apache/Caddyfile
@ -15,7 +15,7 @@
 }

 https://{$ADDITIONAL_TRUSTED_DOMAIN}:443,
-http://{$APACHE_HOST}:{$APACHE_PORT}, # For Collabora callback
+http://{$APACHE_HOST}:23973, # For Collabora callback and WOPI requests, see containers.json
 {$PROTOCOL}://{$NC_DOMAIN}:{$APACHE_PORT} {
    header -Server
    header -X-Powered-By
--- a/Containers/imaginary/Dockerfile
+++ b/Containers/imaginary/Dockerfile
@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:latest
-FROM golang:1.25.0-alpine3.22 AS go
+FROM golang:1.25.1-alpine3.22 AS go

 ENV IMAGINARY_HASH=1d4e251cfcd58ea66f8361f8721d7b8cc85002a3

--- a/manual-install/latest.yml
+++ b/manual-install/latest.yml
@ -255,7 +255,7 @@ services:
    expose:
      - "9980"
    environment:
-      - aliasgroup1=https://${NC_DOMAIN}:443
+      - aliasgroup1=https://${NC_DOMAIN}:443,http://nextcloud-aio-apache:23973
      - 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 --o:remote_font_config.url=https://${NC_DOMAIN}/apps/richdocuments/settings/fonts.json --o:net.post_allow.host[0]=.+
      - dictionaries=${COLLABORA_DICTIONARIES}
      - TZ=${TIMEZONE}
--- 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:%APACHE_PORT%",
+        "aliasgroup1=https://%NC_DOMAIN%:443,http://nextcloud-aio-apache:23973",
        "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 --wopi-url='http://nextcloud-aio-apache:%APACHE_PORT%' --callback-url='http://nextcloud-aio-apache:%APACHE_PORT%'"
+        "php /var/www/html/occ richdocuments:activate-config --wopi-url='http://nextcloud-aio-apache:23973' --callback-url='http://nextcloud-aio-apache:23973'"
      ],
      "profiles": [
        "collabora"
Author	SHA1	Message	Date
szaimen	940e605eb2	Yaml updates Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2025-09-08 09:48:12 +00:00
Simon L.	e4c2f44d81	Merge pull request #6825 from nextcloud/alan/fix-wopi-serving 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 Lint php / php-lint-summary (push) Has been cancelled Details Use a fixed port for internal WOPI requests and callbacks	2025-09-08 11:42:45 +02:00
Simon L.	eece6b97cc	Merge pull request #6832 from nextcloud/dependabot/docker/Containers/imaginary/golang-1.25.1-alpine3.22 build(deps): bump golang from 1.25.0-alpine3.22 to 1.25.1-alpine3.22 in /Containers/imaginary	2025-09-08 10:08:02 +02:00
dependabot[bot]	f37d857b7b	build(deps): bump golang in /Containers/imaginary Bumps golang from 1.25.0-alpine3.22 to 1.25.1-alpine3.22. --- updated-dependencies: - dependency-name: golang dependency-version: 1.25.1-alpine3.22 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2025-09-08 04:30:50 +00:00
Alan Savage	d2e944f7dc	Use a fixed port for internal WOPI requests and callbacks This fixes the issue where Caddy fails to start when APACHE_PORT was 443. Signed-off-by: Alan Savage <3028205+asavageiv@users.noreply.github.com>	2025-09-05 06:18:18 -07:00