diff --git a/doc/docker/development/docker-compose.yml b/doc/docker/development/docker-compose.yml index cd0f9cb3c4..1012eac9e2 100644 --- a/doc/docker/development/docker-compose.yml +++ b/doc/docker/development/docker-compose.yml @@ -24,7 +24,7 @@ volumes: driver_opts: type: none o: bind - device: $PWD/sources/egroupware/swoolpush + device: $PWD/sources/egroupware/swoolepush # for Mac and Windows, do NOT use a directory for the DB, as the Docker host is in a VM! db: sessions: @@ -123,12 +123,12 @@ services: container_name: egroupware-db # push server using phpswoole - #push: - # image: phpswoole/swoole:latest-dev - # volumes: - # - sources-push:/var/www - # - sessions:/var/lib/php/sessions - # container_name: egroupware-push + push: + image: phpswoole/swoole:latest-dev + volumes: + - sources-push:/var/www + - sessions:/var/lib/php/sessions + container_name: egroupware-push # automatic updates of all containers daily at 4am # see https://containrrr.github.io/watchtower for more information diff --git a/doc/docker/development/nginx.conf b/doc/docker/development/nginx.conf index b8190055e0..d1f4712c11 100644 --- a/doc/docker/development/nginx.conf +++ b/doc/docker/development/nginx.conf @@ -66,13 +66,13 @@ server { } # push-server - #location /egroupware/push { - # proxy_http_version 1.1; - # proxy_set_header Host $http_host; - # proxy_set_header Upgrade $http_upgrade; - # proxy_set_header Connection "Upgrade"; - # proxy_pass http://push:9501; - #} + location /egroupware/push { + proxy_http_version 1.1; + proxy_set_header Host $http_host; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "Upgrade"; + proxy_pass http://push:9501; + } # PHP in docroot location ~ [^/]\.php(/|$) {