From 07b971c27b2536904fed9b042206345a89ba858b Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 25 Nov 2022 08:33:05 +0100 Subject: [PATCH 1/2] update the wopi server to 9.3.0 --- .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 bf1a0d78b1..efc3672821 100644 --- a/.drone.star +++ b/.drone.star @@ -811,7 +811,7 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): }, { "name": "wopiserver", - "image": "cs3org/wopiserver:v9.2.5", + "image": "cs3org/wopiserver:v9.3.0", "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 55e3ff0157..5229e0e107 100644 --- a/deployments/examples/ocis_wopi/docker-compose.yml +++ b/deployments/examples/ocis_wopi/docker-compose.yml @@ -137,7 +137,7 @@ services: driver: "local" restart: always wopiserver: - image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.1.1} + image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.3.0} networks: ocis-net: entrypoint: From 3ff0c8b24af55c9b16fe0ca53be7e042d3c3e5db Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 25 Nov 2022 08:57:33 +0100 Subject: [PATCH 2/2] add wait for the wopiserver step --- .drone.star | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.drone.star b/.drone.star index efc3672821..119899eefe 100644 --- a/.drone.star +++ b/.drone.star @@ -819,6 +819,13 @@ def wopiValidatorTests(ctx, storage, accounts_hash_difficulty = 4): "/app/wopiserver.py", ], }, + { + "name": "wait-for-wopi-server", + "image": OC_CI_ALPINE, + "commands": [ + "curl -k --fail --retry-connrefused --retry 7 --retry-all-errors 'http://wopiserver:8880/wopi'", + ], + }, ] + ocisServer(storage, accounts_hash_difficulty, [], [], "wopi_validator") + [