Docker: radicale in volume

README.md

@@ -516,7 +516,7 @@ Example with MySQL
 
 Example with SQLite
 
-    docker run -e DATABASE_TYPE=sqlite -p 127.0.0.1:80:80 -p 127.0.0.1:3060:3060 -p 127.0.0.1:5232:5232 -v /tmp/tracim:/etc/tracim -v /tmp/tracimdb:/var/lib/tracim tracim:latest
+    docker run -e DATABASE_TYPE=sqlite -p 127.0.0.1:80:80 -p 127.0.0.1:3060:3060 -p 127.0.0.1:5232:5232 -v /tmp/tracim:/etc/tracimetc -v /tmp/tracimvar:/var/tracim tracim:latest
 
 # Support and Community #
 

docker/Debian_Uwsgi/Dockerfile

@@ -45,8 +45,8 @@ RUN git clone https://github.com/tracim/tracim.git \
 
 # Prepare volumes
 RUN mkdir /etc/tracim \
-    && mkdir /var/lib/tracim
-VOLUME ["/etc/tracim", "/var/lib/tracim"]
+    && mkdir /var/tracim
+VOLUME ["/etc/tracim", "/var/tracim"]
 
 COPY uwsgi.ini /tracim/tracim/uwsgi.ini.template
 COPY wsgi.py /tracim/tracim/wsgi.py

docker/Debian_Uwsgi/entrypoint.sh

@@ -69,16 +69,19 @@ fi
 
 # SQLite case
 if [ "$DATABASE_TYPE" = sqlite ] ; then
-    if [ ! -f /var/lib/tracim/tracim.db ]; then
+    if [ ! -f /var/tracim/tracim.db ]; then
         INIT_DATABASE=true
     fi
 fi
 
-# Update sqlalchemy.url
+# Update radicale file system folder config
+sed -i "s/\(# radicale.server.filesystem.folder *= *\).*/radicale.server.filesystem.folder = \/var\/tracim\/radicale/" /etc/tracim/config.ini
+
+# Update sqlalchemy.url config
 if ! [ "$DATABASE_TYPE" = sqlite ] ; then
     sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = $DATABASE_TYPE:\/\/$DATABASE_USER:$DATABASE_PASSWORD@$DATABASE_HOST:$DATABASE_PORT\/$DATABASE_NAME$DATABASE_SUFFIX/" /etc/tracim/config.ini
 else
-    sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = sqlite:\/\/\/\/var\/lib\/tracim\/tracim.db/" /etc/tracim/config.ini
+    sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = sqlite:\/\/\/\/var\/tracim\/tracim.db/" /etc/tracim/config.ini
 fi
 
 # Initialize database if needed