From 4a0b01d34f4039d35ec8eee27fc927b2a511d5a9 Mon Sep 17 00:00:00 2001 From: ralf Date: Fri, 3 May 2024 07:57:38 +0200 Subject: [PATCH] some docu fixes to get Collabora installed --- doc/docker/development/README.md | 7 ++++--- doc/docker/development/build.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/doc/docker/development/README.md b/doc/docker/development/README.md index b526f95d17..405ef3dcf3 100644 --- a/doc/docker/development/README.md +++ b/doc/docker/development/README.md @@ -24,11 +24,12 @@ The container and docker-compose.yml file in this directory are the easiest way mkdir dev && cd dev wget https://raw.githubusercontent.com/EGroupware/egroupware/master/doc/docker/development/docker-compose.yml wget https://raw.githubusercontent.com/EGroupware/egroupware/master/doc/docker/development/nginx.conf -mkdir -p sources data/default/files/sqlfs data/default/backup sessions +mkdir -p sources data/default/files/sqlfs data/default/backup data/default/loolwsd sessions # on a Linux host NOT using Docker desktop data and sessions directories MUST be owned by www-data:www-data (33:33, if not Debian/Ubuntu!) chown -R www-data:www-data data sessions +chmod 777 data/default/loolwsd # edit docker-compose.yml to fit your needs eg. -# ports to use for Nginx / the webserver, by default 8080 and 4443 +# ports to use for Nginx / the webserver, by default 80 and 443 # xdebug port, default 9001 (NOT 9000!) # IDE host, default XDEBUG_REMOTE_HOST=docker.for.mac.localhost docker-compose up -d egroupware @@ -80,4 +81,4 @@ Stopping eg. FPM to access IDE/PHPStorm debug port or a MariaDB running on the h To fix that, you have to create an explicit firewall rule to allow containers to acces 172.17.0.1: ```bash sudo ufw allow from 172.16.0.1/12 to 172.17.0.1/32 port 9001,3306 -``` +``` \ No newline at end of file diff --git a/doc/docker/development/build.sh b/doc/docker/development/build.sh index 302a74a35c..6e2dd78bc4 100755 --- a/doc/docker/development/build.sh +++ b/doc/docker/development/build.sh @@ -3,7 +3,7 @@ REPO=egroupware IMAGE=development BASE=node:20-bookworm-slim -RECOMMENDED_PHP_VERSION=8.2 +RECOMMENDED_PHP_VERSION=8.3 PHP_VERSION=${1:-$RECOMMENDED_PHP_VERSION}