From a16b14af9ad715704cac8a0f1f3bb1f45e81402d Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Wed, 31 May 2023 12:54:11 +0200 Subject: [PATCH 1/4] switch to wopiserver 10 --- .drone.star | 2 +- .../ocis_wopi/config/wopiserver/wopiserver.conf.dist | 8 ++++---- deployments/examples/ocis_wopi/docker-compose.yml | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.drone.star b/.drone.star index b7ea613ff2..02df537464 100644 --- a/.drone.star +++ b/.drone.star @@ -916,7 +916,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): }, { "name": "wopiserver", - "image": "cs3org/wopiserver:v9.4.1", + "image": "cs3org/wopiserver:v10.0.0", "detach": True, "commands": [ "cp %s/tests/config/drone/wopiserver.conf /etc/wopi/wopiserver.conf" % (dirs["base"]), diff --git a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist index 07c37e6fd7..f5e16561d2 100644 --- a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist +++ b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist @@ -45,11 +45,11 @@ tokenvalidity = 86400 # WOPI lock expiration time [seconds] wopilockexpiration = 3600 -# WOPI lock strict check: if True, WOPI locks will be compared according to specs, -# that is their representation must match. False (default) allows for a more relaxed -# comparison, which compensates incorrect lock requests from Microsoft Office Online +# WOPI lock strict check: if True (default), WOPI locks will be compared according to specs, +# that is their representation must match. False allows for a more relaxed comparison, +# which compensates incorrect lock requests from Microsoft Office Online 2016-2018 # on-premise setups. -wopilockstrictcheck = False +#wopilockstrictcheck = True # Enable support of rename operations from WOPI apps. This is currently # disabled by default as it has been observed that both MS Office and Collabora diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index d14c1f8bef..d528251cb1 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -147,7 +147,7 @@ services: restart: always wopiserver: - image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.4.0} + image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.0.0} networks: ocis-net: entrypoint: @@ -173,7 +173,7 @@ services: restart: always collabora: - image: collabora/code:22.05.10.1.1 + image: collabora/code:22.05.14.3.1 networks: ocis-net: environment: @@ -196,7 +196,7 @@ services: restart: always onlyoffice: - image: onlyoffice/documentserver:7.3.0 + image: onlyoffice/documentserver:7.3.3 networks: ocis-net: entrypoint: From e4f96333f6e2ed76d3f99b127108b107dea6a039 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 30 Jun 2023 15:36:12 +0200 Subject: [PATCH 2/4] run ocis before wopiserver because wopiserver now depends on running cs3api --- .drone.star | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.drone.star b/.drone.star index e653edeec4..7df188849c 100644 --- a/.drone.star +++ b/.drone.star @@ -922,6 +922,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): }, "steps": skipIfUnchanged(ctx, "acceptance-tests") + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin") + + ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + [ { "name": "fakeoffice", @@ -949,9 +950,6 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): "curl -k --fail --retry-connrefused --retry 9 --retry-all-errors 'http://wopiserver:8880/wopi'", ], }, - ] + - ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + - [ { "name": "prepare-test-file-%s" % (storage), "image": OC_CI_ALPINE, From 26fe028ef471219897cd91b9a76080d01cf4d9b0 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 30 Jun 2023 15:47:15 +0200 Subject: [PATCH 3/4] start fakeoffice before ocis, so that ocis can start --- .drone.star | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.star b/.drone.star index 7df188849c..a9af7916e4 100644 --- a/.drone.star +++ b/.drone.star @@ -922,7 +922,6 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): }, "steps": skipIfUnchanged(ctx, "acceptance-tests") + restoreBuildArtifactCache(ctx, "ocis-binary-amd64", "ocis/bin") + - ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + [ { "name": "fakeoffice", @@ -933,6 +932,9 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): "sh %s/tests/config/drone/serve-hosting-discovery.sh" % (dirs["base"]), ], }, + ] + + ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + + [ { "name": "wopiserver", "image": "cs3org/wopiserver:v10.0.0", From dd5fa693e645376ceebc5b8d6a4faa6c2b37f506 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 30 Jun 2023 16:24:13 +0200 Subject: [PATCH 4/4] use wopiserver 10.0.1 --- .drone.star | 2 +- deployments/examples/ocis_wopi/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index a9af7916e4..cb24d27b7c 100644 --- a/.drone.star +++ b/.drone.star @@ -937,7 +937,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): [ { "name": "wopiserver", - "image": "cs3org/wopiserver:v10.0.0", + "image": "cs3org/wopiserver:v10.0.1", "detach": True, "commands": [ "cp %s/tests/config/drone/wopiserver.conf /etc/wopi/wopiserver.conf" % (dirs["base"]), diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml index 31bb0818b1..28931b26b4 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -161,7 +161,7 @@ services: restart: always wopiserver: - image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.0.0} + image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v10.0.1} networks: ocis-net: entrypoint: