From 0d27fb5d127a51af851fd983d3a3920e68dc282b Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sun, 21 Jan 2024 14:46:52 +0100 Subject: [PATCH 1/3] Fix database host when using MariaDB --- docker/mariadb/env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/mariadb/env b/docker/mariadb/env index afb16c5ed..e6ddbf3ef 100644 --- a/docker/mariadb/env +++ b/docker/mariadb/env @@ -3,7 +3,7 @@ MYSQL_USER=wallabag MYSQL_PASSWORD=wallapass MYSQL_DATABASE=wallabag DATABASE_DRIVER=pdo_mysql -DATABASE_HOST=mysql +DATABASE_HOST=mariadb DATABASE_PORT=3306 DATABASE_NAME=wallabag DATABASE_USER=wallabag From 13a2656555c0c2c47f4ce0d4384069b6fa491f4b Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Sun, 21 Jan 2024 14:47:36 +0100 Subject: [PATCH 2/3] Use root database user for MariaDB --- docker/mariadb/env | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/docker/mariadb/env b/docker/mariadb/env index e6ddbf3ef..bbb3301af 100644 --- a/docker/mariadb/env +++ b/docker/mariadb/env @@ -1,10 +1,8 @@ MYSQL_ROOT_PASSWORD=wallaroot -MYSQL_USER=wallabag -MYSQL_PASSWORD=wallapass MYSQL_DATABASE=wallabag DATABASE_DRIVER=pdo_mysql DATABASE_HOST=mariadb DATABASE_PORT=3306 DATABASE_NAME=wallabag -DATABASE_USER=wallabag -DATABASE_PASSWORD=wallapass +DATABASE_USER=root +DATABASE_PASSWORD=wallaroot From edcf4aafabe858b64de4c50fae49cd9d86b49a6f Mon Sep 17 00:00:00 2001 From: Yassine Guedidi Date: Thu, 25 Jan 2024 02:08:00 +0100 Subject: [PATCH 3/3] Fix charset of local MariaDB --- docker/mariadb/env | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/mariadb/env b/docker/mariadb/env index bbb3301af..8c8a01fd3 100644 --- a/docker/mariadb/env +++ b/docker/mariadb/env @@ -6,3 +6,4 @@ DATABASE_PORT=3306 DATABASE_NAME=wallabag DATABASE_USER=root DATABASE_PASSWORD=wallaroot +DATABASE_CHARSET=utf8mb4