extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Collabora init container and Nginx config for newer Collabora version

Browse Source 
also fix wrong path for sources-push volume
This commit is contained in:
ralf 2023-04-12 10:29:08 +02:00
parent 2f4fff03f9
commit f2079ccb49
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/docker/docker-compose.yml
View File

@ -12,7 +12,7 @@ volumes:
driver_opts: driver_opts:
type: none type: none
o: bind o: bind
device: $PWD/sources/egroupware/swoolepush device: $PWD/sources/swoolepush
db: db:
data: data:
driver_opts: driver_opts:
@ -187,12 +187,8 @@ services:
collabora-key: collabora-key:
image: "quay.io/egroupware/collabora-key:stable" image: "quay.io/egroupware/collabora-key:stable"
#image: collabora/code:latest #image: collabora/code:latest
# needs to be initialised via: docker run --rm -v dev_collabora-config:/mnt --entrypoint '/bin/cp -r /etc/loolwsd /mnt' quay.io/egroupware/collabora-key:stable
volumes: volumes:
- collabora-config:/etc/loolwsd - collabora-config:/etc/coolwsd
# dont try to regenerate the (not used certificate) as volumn is readonly
environment:
- DONT_GEN_SSL_CERT=1
restart: always restart: always
container_name: collabora-key container_name: collabora-key
# set the ip-address of your docker host AND your official DNS name so Collabora # set the ip-address of your docker host AND your official DNS name so Collabora
@ -205,7 +201,7 @@ services:
# initialise the collabora-config volume # initialise the collabora-config volume
collabora-init: collabora-init:
image: "quay.io/egroupware/collabora-key:latest" image: "quay.io/egroupware/collabora-key:latest"
command: bash -c "test -f /tmp/coolwsd/coolwsd.xml || (cp -p /etc/coolwsd/* /tmp/coolwsd && cd /tmp/coolwsd && ln -s coolwsd.conf loolwsd.conf)" command: bash -c 'test -f /tmp/coolwsd/coolwsd.xml || (cp -p /etc/coolwsd/* /tmp/coolwsd/; sed "s/<enable type=\"bool\" desc=\"Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable.\" default=\"true\">true</<enable type=\"bool\" desc=\"Controls whether SSL encryption between coolwsd and the network is enabled (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable.\" default=\"true\">false</g" < /etc/coolwsd/coolwsd.xml > /tmp/coolwsd/coolwsd.xml)'
volumes: volumes:
- collabora-config:/tmp/coolwsd - collabora-config:/tmp/coolwsd

12
doc/docker/nginx.conf
View File

@ -149,7 +149,7 @@ server {
# Collabora sniplet meant to be included in server block of EGroupware vhost # Collabora sniplet meant to be included in server block of EGroupware vhost
# static files # static files
location ^~ /loleaflet { location ^~ /browser {
proxy_pass http://collabora-key:9980; proxy_pass http://collabora-key:9980;
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
@ -160,8 +160,14 @@ server {
proxy_set_header Host $http_host; proxy_set_header Host $http_host;
} }
# websockets, download, presentation and image upload # Capabilities
location ^~ /lool { location ^~ /hosting/capabilities {
proxy_pass http://collabora-key:9980;
proxy_set_header Host $http_host;
}
# websockets, download, presentation and image upload
location ^~ /cool {
proxy_pass http://collabora-key:9980; proxy_pass http://collabora-key:9980;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";