From e69d2e9a06d1bc1735e5096ec34b740bced48714 Mon Sep 17 00:00:00 2001
From: Willy Kloucek <wkloucek@owncloud.com>
Date: Fri, 7 Oct 2022 09:50:06 +0200
Subject: [PATCH] update deployment examples, especially the wopi example

---
 .../examples/oc10_ocis_parallel/docker-compose.yml   |  2 +-
 deployments/examples/ocis_hello/docker-compose.yml   |  2 +-
 .../ocis_individual_services/docker-compose.yml      |  2 +-
 .../examples/ocis_keycloak/docker-compose.yml        |  2 +-
 deployments/examples/ocis_ldap/docker-compose.yml    |  2 +-
 deployments/examples/ocis_s3/docker-compose.yml      |  2 +-
 deployments/examples/ocis_traefik/docker-compose.yml |  2 +-
 .../config/wopiserver/entrypoint-override.sh         |  9 ++-------
 .../ocis_wopi/config/wopiserver/wopiserver.conf.dist |  3 ++-
 deployments/examples/ocis_wopi/docker-compose.yml    | 12 +++++-------
 10 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/deployments/examples/oc10_ocis_parallel/docker-compose.yml b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
index 58d16c3f29..555ff8f2ae 100644
--- a/deployments/examples/oc10_ocis_parallel/docker-compose.yml
+++ b/deployments/examples/oc10_ocis_parallel/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_hello/docker-compose.yml b/deployments/examples/ocis_hello/docker-compose.yml
index ffe0499728..e2a93b1cd8 100644
--- a/deployments/examples/ocis_hello/docker-compose.yml
+++ b/deployments/examples/ocis_hello/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_individual_services/docker-compose.yml b/deployments/examples/ocis_individual_services/docker-compose.yml
index 8974bd9cc7..faefbb339d 100644
--- a/deployments/examples/ocis_individual_services/docker-compose.yml
+++ b/deployments/examples/ocis_individual_services/docker-compose.yml
@@ -17,7 +17,7 @@ networks:
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_keycloak/docker-compose.yml b/deployments/examples/ocis_keycloak/docker-compose.yml
index 630ca1b70e..ca1b637493 100644
--- a/deployments/examples/ocis_keycloak/docker-compose.yml
+++ b/deployments/examples/ocis_keycloak/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_ldap/docker-compose.yml b/deployments/examples/ocis_ldap/docker-compose.yml
index 05fcb8a87c..aad3783476 100644
--- a/deployments/examples/ocis_ldap/docker-compose.yml
+++ b/deployments/examples/ocis_ldap/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_s3/docker-compose.yml b/deployments/examples/ocis_s3/docker-compose.yml
index 91d07b291e..06b5f36801 100644
--- a/deployments/examples/ocis_s3/docker-compose.yml
+++ b/deployments/examples/ocis_s3/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_traefik/docker-compose.yml b/deployments/examples/ocis_traefik/docker-compose.yml
index 1b37ca17aa..6fa018372f 100644
--- a/deployments/examples/ocis_traefik/docker-compose.yml
+++ b/deployments/examples/ocis_traefik/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
diff --git a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
index b7e354637e..fd7960259b 100755
--- a/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
+++ b/deployments/examples/ocis_wopi/config/wopiserver/entrypoint-override.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 echo "${WOPISECRET}" > /etc/wopi/wopisecret
@@ -6,13 +6,8 @@ echo "${WOPISECRET}" > /etc/wopi/wopisecret
 cp /etc/wopi/wopiserver.conf.dist /etc/wopi/wopiserver.conf
 sed -i 's/wopiserver.owncloud.test/'${WOPISERVER_DOMAIN}'/g' /etc/wopi/wopiserver.conf
 
-
 if [ "$WOPISERVER_INSECURE" == "true" ]; then
     sed -i 's/sslverify\s=\sTrue/sslverify = False/g' /etc/wopi/wopiserver.conf
 fi
 
-touch /var/log/wopi/wopiserver.log
-
-/app/wopiserver.py &
-
-tail -f /var/log/wopi/wopiserver.log
+/app/wopiserver.py
diff --git a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
index 8be39f41b8..808d105292 100644
--- a/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
+++ b/deployments/examples/ocis_wopi/config/wopiserver/wopiserver.conf.dist
@@ -18,6 +18,8 @@ port = 8880
 # Logging level. Debug enables the Flask debug mode as well.
 # Valid values are: Debug, Info, Warning, Error.
 loglevel = Error
+loghandler = stream
+logdest = stdout
 
 # URL of your WOPI server or your HA proxy in front of it
 wopiurl = https://wopiserver.owncloud.test
@@ -92,7 +94,6 @@ usehttps = no
 wopicert = /etc/grid-security/host.crt
 wopikey = /etc/grid-security/host.key
 
-
 [bridge]
 # SSL certificate check for the connected apps
 sslverify = True
diff --git a/deployments/examples/ocis_wopi/docker-compose.yml b/deployments/examples/ocis_wopi/docker-compose.yml
index 90083d9024..e93c7406ce 100644
--- a/deployments/examples/ocis_wopi/docker-compose.yml
+++ b/deployments/examples/ocis_wopi/docker-compose.yml
@@ -3,7 +3,7 @@ version: "3.7"
 
 services:
   traefik:
-    image: traefik:v2.6.6
+    image: traefik:v2.9.1
     networks:
       ocis-net:
         aliases:
@@ -131,11 +131,11 @@ services:
       driver: "local"
     restart: always
   wopiserver:
-    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v8.3.3}
+    image: cs3org/wopiserver:${WOPISERVER_DOCKER_TAG:-v9.1.1}
     networks:
       ocis-net:
     entrypoint:
-      - /bin/bash
+      - /bin/sh
       - /entrypoint-override.sh
     environment:
       WOPISERVER_INSECURE: "${INSECURE:-false}"
@@ -145,7 +145,6 @@ services:
       - ./config/wopiserver/entrypoint-override.sh:/entrypoint-override.sh
       - ./config/wopiserver/wopiserver.conf.dist:/etc/wopi/wopiserver.conf.dist
       - wopi-data:/var/wopi_local_storage
-      - wopi-logs:/var/log/wopi
     labels:
       - "traefik.enable=true"
       - "traefik.http.routers.wopiserver.entrypoints=https"
@@ -158,7 +157,7 @@ services:
     restart: always
 
   collabora:
-    image: collabora/code:22.05.4.1.1@sha256:157cfc71fe9fe09b672dd28222f91e0c3f307e593fbb449fb297f8659ac8f960
+    image: collabora/code:22.05.6.3.1
     networks:
       ocis-net:
     environment:
@@ -181,7 +180,7 @@ services:
     restart: always
 
   onlyoffice:
-    image: onlyoffice/documentserver:7.1.1
+    image: onlyoffice/documentserver:7.2
     networks:
       ocis-net:
     environment:
@@ -206,7 +205,6 @@ volumes:
   ocis-config:
   ocis-data:
   wopi-data:
-  wopi-logs:
 
 networks:
   ocis-net: