From: Thomas Bruederli <redacted>
Date: Wed, 1 Jan 2020 20:55:37 +0000 (+0100)
Subject: Place Sqlite DB file in volume /var/roundcube/db
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ac363e350efed6ca9f132bec0c4284634c255bc1;p=roundcube-roundcubemail-docker.git

Place Sqlite DB file in volume /var/roundcube/db

fixes issue #76
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 4dc9c94..7b0fcda 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -50,6 +50,7 @@ RUN a2enmod rewrite
 
 # expose these volumes
 VOLUME /var/roundcube/config
+VOLUME /var/roundcube/db
 VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 4a45bee..733453e 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -46,9 +46,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 
     /wait-for-it.sh ${ROUNDCUBEMAIL_DB_HOST}:${ROUNDCUBEMAIL_DB_PORT} -t 30
   else
-    # use local SQLite DB in /var/www/html/db
+    # use local SQLite DB in /var/roundcube/db
     : "${ROUNDCUBEMAIL_DB_TYPE:=sqlite}"
-    : "${ROUNDCUBEMAIL_DB_DIR:=$PWD/db}"
+    : "${ROUNDCUBEMAIL_DB_DIR:=/var/roundcube/db}"
     : "${ROUNDCUBEMAIL_DB_NAME:=sqlite}"
     : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}:///$ROUNDCUBEMAIL_DB_DIR/${ROUNDCUBEMAIL_DB_NAME}.db?mode=0646}"
 
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 28246a4..89e82cc 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -44,6 +44,7 @@ RUN set -ex; \
 
 # expose these volumes
 VOLUME /var/roundcube/config
+VOLUME /var/roundcube/db
 VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
diff --git a/fpm-alpine/docker-entrypoint.sh b/fpm-alpine/docker-entrypoint.sh
index 4a45bee..733453e 100755
--- a/fpm-alpine/docker-entrypoint.sh
+++ b/fpm-alpine/docker-entrypoint.sh
@@ -46,9 +46,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 
     /wait-for-it.sh ${ROUNDCUBEMAIL_DB_HOST}:${ROUNDCUBEMAIL_DB_PORT} -t 30
   else
-    # use local SQLite DB in /var/www/html/db
+    # use local SQLite DB in /var/roundcube/db
     : "${ROUNDCUBEMAIL_DB_TYPE:=sqlite}"
-    : "${ROUNDCUBEMAIL_DB_DIR:=$PWD/db}"
+    : "${ROUNDCUBEMAIL_DB_DIR:=/var/roundcube/db}"
     : "${ROUNDCUBEMAIL_DB_NAME:=sqlite}"
     : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}:///$ROUNDCUBEMAIL_DB_DIR/${ROUNDCUBEMAIL_DB_NAME}.db?mode=0646}"
 
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 988ce66..06872d7 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -48,6 +48,7 @@ RUN set -ex; \
 
 # expose these volumes
 VOLUME /var/roundcube/config
+VOLUME /var/roundcube/db
 VOLUME /var/www/html
 VOLUME /tmp/roundcube-temp
 
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 4a45bee..733453e 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -46,9 +46,9 @@ if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
 
     /wait-for-it.sh ${ROUNDCUBEMAIL_DB_HOST}:${ROUNDCUBEMAIL_DB_PORT} -t 30
   else
-    # use local SQLite DB in /var/www/html/db
+    # use local SQLite DB in /var/roundcube/db
     : "${ROUNDCUBEMAIL_DB_TYPE:=sqlite}"
-    : "${ROUNDCUBEMAIL_DB_DIR:=$PWD/db}"
+    : "${ROUNDCUBEMAIL_DB_DIR:=/var/roundcube/db}"
     : "${ROUNDCUBEMAIL_DB_NAME:=sqlite}"
     : "${ROUNDCUBEMAIL_DSNW:=${ROUNDCUBEMAIL_DB_TYPE}:///$ROUNDCUBEMAIL_DB_DIR/${ROUNDCUBEMAIL_DB_NAME}.db?mode=0646}"