From 33111ec7bc0abbed0b91007556e13c1b1068ef55 Mon Sep 17 00:00:00 2001
From: Philipp Le <philipp-le-prviat@freenet.de>
Date: Sun, 21 Feb 2021 10:15:40 +0100
Subject: feat: Make volume directory configurable

---
 README.md          | 11 +++++++++++
 docker-compose.yml |  8 ++++----
 sample.env         |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c637b5c..db6b3a2 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,19 @@ Based on: [https://github.com/pr3d4t0r/calendar](https://github.com/pr3d4t0r/cal
 
 # Installation
 
+Edit the configuration:
+```
+cp sample.env .env
+nano .env
+```
+
+Build the image:
 ```
 docker-compose build
+```
+
+Prepare write permissions and structure of the volumes:
+```
 mkdir -p volumes/Specific/db
 chown -R 33:33 volumes/Specific
 ```
diff --git a/docker-compose.yml b/docker-compose.yml
index 7a7d6fc..53f4b76 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,8 +4,8 @@ services:
     db:
         image: mysql:5.7
         volumes:
-            - ./volumes/db:/var/lib/mysql
-        restart: always
+            - ${VOLUMES_DIR}/volumes/db:/var/lib/mysql
+        restart: unless-stopped
         environment:
             MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD}
             MYSQL_DATABASE: ${MYSQL_DATABASE}
@@ -23,7 +23,7 @@ services:
         environment:
             CONTAINER_DOMAIN_NAME: ${DOMAIN_NAME}
             CONTAINER_HOST_NAME: ${HOST_NAME}
-        restart: always
+        restart: unless-stopped
         labels:
             - "traefik.http.routers.baikal.rule=Host(`${HOST_NAME}.${DOMAIN_NAME}`)"
             - "traefik.http.middlewares.baikal-path.replacepathregex.regex=^/${PATH_PREFIX}/(.*)"
@@ -32,4 +32,4 @@ services:
             - "traefik.http.routers.baikal-nosub.middlewares=baikal-path@docker"
             - "traefik.http.routers.baikal-wellknown.rule=(Host(`${DOMAIN_NAME}`) || Host(`www.${DOMAIN_NAME}`) && (Path(`.well-known/caldav`) || Path(`.well-known/carddav`))"
         volumes:
-            - ./volumes/Specific:/var/www/html/Specific
+            - ${VOLUMES_DIR}/volumes/Specific:/var/www/html/Specific
diff --git a/sample.env b/sample.env
index 6c86ec6..f6b792a 100644
--- a/sample.env
+++ b/sample.env
@@ -1,3 +1,4 @@
+VOLUMES_DIR=.
 MYSQL_ROOT_PASSWORD=verysecurepassword
 MYSQL_DATABASE=baikal
 MYSQL_USER=baikal
-- 
cgit v1.1