diff --git a/README.md b/README.md index b7208eb..ac6d032 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ A simple, fully translatable admin interface and frontend for `sabre/dav` based # Requirements -PHP > 7.3.0, MySQL (or MariaDB). +PHP > 7.3.0 (with `pdo_mysql` and `intl` extensions), MySQL (or MariaDB). # Installation @@ -188,10 +188,12 @@ You can start the containers with : docker exec -it davis bash -c "APP_ENV=prod bin/console migrate --no-interaction" -Then, head up to to see the status display : +Then, head up to `http://` to see the status display : ![Status page](https://raw.githubusercontent.com/tchapi/davis/master/_screenshots/status.png) +> Note that there is no user, no principals, etc created by default. + # Development You can spin off a local PHP webserver with: diff --git a/docker/Dockerfile b/docker/Dockerfile index c69a870..5425083 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,7 @@ FROM php:7.3-fpm +LABEL maintainer="tchap@tchap.me" + # Mail : configuration for ssmtp ARG email ARG mail_host diff --git a/docker/configurations/davis.conf b/docker/configurations/davis.conf index 6187c6c..1e83652 100644 --- a/docker/configurations/davis.conf +++ b/docker/configurations/davis.conf @@ -1,4 +1,8 @@ -# This is a very simple / naive configuration for Davis +# This is a very simple / naive configuration for nginx + Davis +# +# USE HTTPS IN PRODUCTION +# + upstream docker-davis { server davis:9000; } diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7892ffe..be07620 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.7" services: nginx: - image: nginx:alpine + image: nginx:1.17.5-alpine container_name: nginx env_file: .env command: "/bin/sh -c 'while :; do sleep 6h & wait $${!}; nginx -s reload; done & nginx -g \"daemon off;\"'" @@ -18,7 +18,7 @@ services: - 80:80 mysql: - image: mariadb:latest + image: mariadb:10.4.10 container_name: mysql env_file: .env