From a4420a89e763bd2dbb8c59da3c1a72d1820b4ab4 Mon Sep 17 00:00:00 2001
From: Florian Zirker <florian.zirker@kapsweyer.de>
Date: Fri, 5 Apr 2024 06:40:41 +0000
Subject: [PATCH] wallabag: upgrade to mariadb:11 and some improvements

---
 wallabag/docker-compose.yaml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/wallabag/docker-compose.yaml b/wallabag/docker-compose.yaml
index 6433ff3..43b6083 100644
--- a/wallabag/docker-compose.yaml
+++ b/wallabag/docker-compose.yaml
@@ -20,9 +20,9 @@ services:
       - web
       - wallabag
     volumes:
-      - /var/dockervolumes/wallabag/images:/var/www/wallabag/web/assets/images
+      - ${VOLUMES_PATH}/wallabag/images:/var/www/wallabag/web/assets/images
     healthcheck:
-      test: ["CMD", "wget" ,"--no-verbose", "--tries=1", "--spider", "http://localhost"]
+      test: ["CMD", "curl" ,"--fail", "http://localhost/api/info"]
       interval: 10s
       timeout: 3s
     labels:
@@ -35,23 +35,19 @@ services:
     depends_on:
       - db
       - redis
-  
+
   db:
-    image: mariadb:10
+    image: mariadb:${MARIADB_VERSION}
     restart: unless-stopped
     environment:
-      - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
+      - MARIADB_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD}
     networks:
       - wallabag
     volumes:
       - /var/dockervolumes/wallabag/db:/var/lib/mysql
-    healthcheck:
-      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
-      interval: 10s
-      timeout: 3s
     labels:
       - "docker.group=wallabag"
-  
+
   redis:
     image: redis
     restart: unless-stopped