update deployment examples, especially the wopi example

This commit is contained in:
Willy Kloucek
2022-10-07 09:50:06 +02:00
parent c4b09b0e02
commit e69d2e9a06
10 changed files with 16 additions and 22 deletions

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -17,7 +17,7 @@ networks:
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -3,7 +3,7 @@ version: "3.7"
services:
traefik:
image: traefik:v2.6.6
image: traefik:v2.9.1
networks:
ocis-net:
aliases:

View File

@@ -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

View File

@@ -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

View File

@@ -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: