Merge pull request #402 from wallabag/fix/sqlite

Fix SQLite provisioning
Merge pull request #401 from wallabag/impr/doc
2026-02-22 17:57:38 +01:00 · 2024-03-10 21:59:54 +01:00 · 2024-03-10 21:59:31 +01:00 · 2024-03-10 16:21:31 +01:00 · 2024-03-10 16:20:26 +01:00
2 changed files with 14 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -132,7 +132,7 @@ services:
    volumes:
      - /opt/wallabag/images:/var/www/wallabag/web/assets/images
    healthcheck:
-      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"]
+      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost/api/info"]
      interval: 1m
      timeout: 3s
    depends_on:
--- a/root/entrypoint.sh
+++ b/root/entrypoint.sh
@ -23,6 +23,8 @@ install_wallabag() {
 provisioner() {
    SYMFONY__ENV__DATABASE_DRIVER=${SYMFONY__ENV__DATABASE_DRIVER:-pdo_sqlite}
    POPULATE_DATABASE=${POPULATE_DATABASE:-True}
+    SQLITE_DB_DIR="/var/www/wallabag/data/db"
+    SQLITE_DB_FILEPATH="$SQLITE_DB_DIR/wallabag.sqlite"

    # Replace environment variables
    envsubst < /etc/wallabag/parameters.template.yml > app/config/parameters.yml
@ -33,10 +35,17 @@ provisioner() {
    fi

    # Configure SQLite database
-    SQLITE_FILE_SIZE=$(wc -c "/var/www/wallabag/data/db/wallabag.sqlite" | awk '{print $1}')
-    if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_sqlite" ] && ([ ! -f "/var/www/wallabag/data/db/wallabag.sqlite" ] || [ "$SQLITE_FILE_SIZE" = 0 ]) ; then
-        echo "Configuring the SQLite database ..."
-        install_wallabag
+    if [ "$SYMFONY__ENV__DATABASE_DRIVER" = "pdo_sqlite" ]; then
+        # mkdir and chown are mandatory for local folder binding
+        if [ ! -f "$SQLITE_DB_FILEPATH" ]; then
+            mkdir -p "$SQLITE_DB_DIR"
+            chown nobody: "$SQLITE_DB_DIR"
+        fi
+
+        if [ ! -s "$SQLITE_DB_FILEPATH" ]; then
+            echo "Configuring the SQLite database ..."
+            install_wallabag
+        fi
    fi

    # Configure MySQL / MariaDB database
Author	SHA1	Message	Date
Kevin Decherf	4143013553	Merge pull request #402 from wallabag/fix/sqlite Fix SQLite provisioning	2024-03-10 21:59:54 +01:00
Kevin Decherf	eaf63d2098	Merge pull request #401 from wallabag/impr/doc doc: change docker-compose healthcheck target	2024-03-10 21:59:31 +01:00
Kevin Decherf	9c6aca3b76	Fix SQLite provisioning If we use a local folder volume binding, install_wallabag was failing because of missing file and permission issues. This reworks the way we initially create the database when it is missing or empty. Superseeds #386 Fixes #316 #346 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2024-03-10 16:21:31 +01:00
Kevin Decherf	e16d9e4113	doc: change docker-compose healthcheck target Signed-off-by: Kevin Decherf <kevin@kdecherf.com>	2024-03-10 16:20:26 +01:00