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

get push working in developer container

Browse Source
This commit is contained in:
Ralf Becker 2019-11-11 21:12:26 +01:00
parent c768c9cbf7
commit dd1bf97406
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
doc/docker/development/docker-compose.yml
View File

@ -24,7 +24,7 @@ volumes:
driver_opts: driver_opts:
type: none type: none
o: bind 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! # for Mac and Windows, do NOT use a directory for the DB, as the Docker host is in a VM!
db: db:
sessions: sessions:
@ -123,12 +123,12 @@ services:
container_name: egroupware-db container_name: egroupware-db
# push server using phpswoole # push server using phpswoole
#push: push:
# image: phpswoole/swoole:latest-dev image: phpswoole/swoole:latest-dev
# volumes: volumes:
# - sources-push:/var/www - sources-push:/var/www
# - sessions:/var/lib/php/sessions - sessions:/var/lib/php/sessions
# container_name: egroupware-push container_name: egroupware-push
# automatic updates of all containers daily at 4am # automatic updates of all containers daily at 4am
# see https://containrrr.github.io/watchtower for more information # see https://containrrr.github.io/watchtower for more information

14
doc/docker/development/nginx.conf
View File

@ -66,13 +66,13 @@ server {
} }
# push-server # push-server
#location /egroupware/push { location /egroupware/push {
# proxy_http_version 1.1; proxy_http_version 1.1;
# proxy_set_header Host $http_host; proxy_set_header Host $http_host;
# proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
# proxy_set_header Connection "Upgrade"; proxy_set_header Connection "Upgrade";
# proxy_pass http://push:9501; proxy_pass http://push:9501;
#} }
# PHP in docroot # PHP in docroot
location ~ [^/]\.php(/|$) { location ~ [^/]\.php(/|$) {