From 91eae7d067be09d0aa6af3dd617a7aff4a66a9bb Mon Sep 17 00:00:00 2001
From: Igor Scheller <igor.scheller@igorshp.de>
Date: Fri, 11 Oct 2019 22:56:38 +0200
Subject: docker-compose: Set mariadb version and added local dev env to readme

---
 README.md                  | 14 ++++++++++++++
 contrib/docker-compose.yml |  3 ++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 02508157..5cf9f652 100644
--- a/README.md
+++ b/README.md
@@ -127,6 +127,20 @@ Import database
 docker exec -it engelsystem bin/migrate
 ```
 
+#### Local development
+To use the working directory in the container the docker-compose file has to be changed:
+```yaml
+[...]
+  nginx:
+    volumes:
+      - ../public/assets:/var/www/public/assets
+[...]
+  engelsystem:
+    volumes:
+      - ../:/var/www
+[...]
+```
+
 #### Scripts
 ##### bin/deploy.sh
 The `bin/deploy.sh` script can be used to deploy the engelsystem. It uses rsync to deploy the application to a server over ssh.
diff --git a/contrib/docker-compose.yml b/contrib/docker-compose.yml
index 197e2281..4624cce4 100644
--- a/contrib/docker-compose.yml
+++ b/contrib/docker-compose.yml
@@ -27,12 +27,13 @@ services:
     depends_on:
       - database
   database:
-    image: mariadb:latest
+    image: mariadb:10.2
     environment:
       MYSQL_DATABASE: engelsystem
       MYSQL_USER: engelsystem
       MYSQL_PASSWORD: engelsystem
       MYSQL_RANDOM_ROOT_PASSWORD: 1
+      MYSQL_INITDB_SKIP_TZINFO: "yes"
     volumes:
       - db:/var/lib/mysql
     networks:
-- 
cgit v1.2.3-70-g09d2