Browse Source

Docker: radicale in volume

Bastien Sevajol (Algoo) 7 years ago
parent
commit
9b5a3a2189
3 changed files with 9 additions and 6 deletions
  1. 1 1
      README.md
  2. 2 2
      docker/Debian_Uwsgi/Dockerfile
  3. 6 3
      docker/Debian_Uwsgi/entrypoint.sh

+ 1 - 1
README.md View File

516
 
516
 
517
 Example with SQLite
517
 Example with SQLite
518
 
518
 
519
-    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
519
+    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
520
 
520
 
521
 # Support and Community #
521
 # Support and Community #
522
 
522
 

+ 2 - 2
docker/Debian_Uwsgi/Dockerfile View File

45
 
45
 
46
 # Prepare volumes
46
 # Prepare volumes
47
 RUN mkdir /etc/tracim \
47
 RUN mkdir /etc/tracim \
48
-    && mkdir /var/lib/tracim
49
-VOLUME ["/etc/tracim", "/var/lib/tracim"]
48
+    && mkdir /var/tracim
49
+VOLUME ["/etc/tracim", "/var/tracim"]
50
 
50
 
51
 COPY uwsgi.ini /tracim/tracim/uwsgi.ini.template
51
 COPY uwsgi.ini /tracim/tracim/uwsgi.ini.template
52
 COPY wsgi.py /tracim/tracim/wsgi.py
52
 COPY wsgi.py /tracim/tracim/wsgi.py

+ 6 - 3
docker/Debian_Uwsgi/entrypoint.sh View File

69
 
69
 
70
 # SQLite case
70
 # SQLite case
71
 if [ "$DATABASE_TYPE" = sqlite ] ; then
71
 if [ "$DATABASE_TYPE" = sqlite ] ; then
72
-    if [ ! -f /var/lib/tracim/tracim.db ]; then
72
+    if [ ! -f /var/tracim/tracim.db ]; then
73
         INIT_DATABASE=true
73
         INIT_DATABASE=true
74
     fi
74
     fi
75
 fi
75
 fi
76
 
76
 
77
-# Update sqlalchemy.url
77
+# Update radicale file system folder config
78
+sed -i "s/\(# radicale.server.filesystem.folder *= *\).*/radicale.server.filesystem.folder = \/var\/tracim\/radicale/" /etc/tracim/config.ini
79
+
80
+# Update sqlalchemy.url config
78
 if ! [ "$DATABASE_TYPE" = sqlite ] ; then
81
 if ! [ "$DATABASE_TYPE" = sqlite ] ; then
79
     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
82
     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
80
 else
83
 else
81
-    sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = sqlite:\/\/\/\/var\/lib\/tracim\/tracim.db/" /etc/tracim/config.ini
84
+    sed -i "s/\(sqlalchemy.url *= *\).*/\\sqlalchemy.url = sqlite:\/\/\/\/var\/tracim\/tracim.db/" /etc/tracim/config.ini
82
 fi
85
 fi
83
 
86
 
84
 # Initialize database if needed
87
 # Initialize database if needed