From 2cb5f82d8cf466c40fde55eee60889bfe8bcb9cb Mon Sep 17 00:00:00 2001 From: Julius Knorr Date: Fri, 29 May 2026 15:51:44 +0200 Subject: [PATCH] fix(wopi): ship document-formats for discovery Add the document-formats submodule and bundle its onlyoffice-docs-formats.json into the documentserver tree, so WOPI /hosting/discovery and /meta/formats find the file the config and nginx already reference. Co-Authored-By: Claude Opus 4.8 Signed-off-by: Julius Knorr AI-assistant: Claude Code 2.1.156 (Claude Opus 4.8 claude-opus-4-8) --- .gitmodules | 4 ++++ build/.docker/bundle.bake.Dockerfile | 2 ++ document-formats | 1 + 3 files changed, 7 insertions(+) create mode 160000 document-formats diff --git a/.gitmodules b/.gitmodules index ba7fde0f4f..06de7901a4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ [submodule "sdkjs-forms"] path = sdkjs-forms url = https://github.com/Euro-Office/sdkjs-forms.git +[submodule "document-formats"] + path = document-formats + url = https://github.com/Euro-Office/document-formats.git + branch = main diff --git a/build/.docker/bundle.bake.Dockerfile b/build/.docker/bundle.bake.Dockerfile index 5f42807d38..90edf9874c 100644 --- a/build/.docker/bundle.bake.Dockerfile +++ b/build/.docker/bundle.bake.Dockerfile @@ -27,6 +27,8 @@ FROM alpine AS bundle COPY dictionaries /build/documentserver/dictionaries COPY document-templates /build/documentserver/document-templates COPY core-fonts /build/documentserver/core-fonts + # WOPI/discovery format list consumed by services.CoAuthoring.server.documentFormatsFile + COPY document-formats/onlyoffice-docs-formats.json /build/documentserver/document-formats/onlyoffice-docs-formats.json # --- Config files COPY build/configs/core/DoctRenderer.config /build/documentserver/server/FileConverter/bin/DoctRenderer.config diff --git a/document-formats b/document-formats new file mode 160000 index 0000000000..4699582808 --- /dev/null +++ b/document-formats @@ -0,0 +1 @@ +Subproject commit 46995828084d4460112efec579499809f418ca6e