From bc818056e605fedae9038253a7df1f8a4f2eb3e8 Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@marginalia.nu>
Date: Thu, 16 Jan 2025 15:27:02 +0100
Subject: [PATCH] (run) Fix templates for mariadb

Apparently the docker image contract changed at some point, and now we should spawn mariadbd and not mysqld; mariadb-admin and not mysqladmin.
---
 run/install/barebones-1/docker-compose.yml.template          | 4 ++--
 run/install/barebones-2/docker-compose.yml.template          | 4 ++--
 run/install/marginalia-prod-like/docker-compose.yml.template | 4 ++--
 run/install/no-docker/docker-compose.yml.template            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/run/install/barebones-1/docker-compose.yml.template b/run/install/barebones-1/docker-compose.yml.template
index 507a9a1e..f9c397d1 100644
--- a/run/install/barebones-1/docker-compose.yml.template
+++ b/run/install/barebones-1/docker-compose.yml.template
@@ -72,11 +72,11 @@ services:
     image: "mariadb:lts"
     container_name: "mariadb"
     env_file: "${INSTALL_DIR}/env/mariadb.env"
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
     ports:
       - "127.0.0.1:3306:3306/tcp"
     healthcheck:
-      test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval}
+      test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
       start_period: 5s
       interval: 5s
       timeout: 5s
diff --git a/run/install/barebones-2/docker-compose.yml.template b/run/install/barebones-2/docker-compose.yml.template
index 80c43f87..aa3ca12f 100644
--- a/run/install/barebones-2/docker-compose.yml.template
+++ b/run/install/barebones-2/docker-compose.yml.template
@@ -103,11 +103,11 @@ services:
     image: "mariadb:lts"
     container_name: "mariadb"
     env_file: "${INSTALL_DIR}/env/mariadb.env"
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
     ports:
       - "127.0.0.1:3306:3306/tcp"
     healthcheck:
-      test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval}
+      test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
       start_period: 5s
       interval: 5s
       timeout: 5s
diff --git a/run/install/marginalia-prod-like/docker-compose.yml.template b/run/install/marginalia-prod-like/docker-compose.yml.template
index 481dcabc..1d4fd335 100644
--- a/run/install/marginalia-prod-like/docker-compose.yml.template
+++ b/run/install/marginalia-prod-like/docker-compose.yml.template
@@ -129,11 +129,11 @@ services:
     image: "mariadb:lts"
     container_name: "mariadb"
     env_file: "${INSTALL_DIR}/env/mariadb.env"
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
     ports:
       - "127.0.0.1:3306:3306/tcp"
     healthcheck:
-      test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval}
+      test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
       start_period: 5s
       interval: 5s
       timeout: 5s
diff --git a/run/install/no-docker/docker-compose.yml.template b/run/install/no-docker/docker-compose.yml.template
index d1513e0e..1f6d4534 100644
--- a/run/install/no-docker/docker-compose.yml.template
+++ b/run/install/no-docker/docker-compose.yml.template
@@ -3,11 +3,11 @@ services:
     image: "mariadb:lts"
     container_name: "mariadb"
     env_file: "${INSTALL_DIR}/env/mariadb.env"
-    command: ['mysqld', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
+    command: ['mariadbd', '--character-set-server=utf8mb4', '--collation-server=utf8mb4_unicode_ci']
     ports:
       - "127.0.0.1:3306:3306/tcp"
     healthcheck:
-      test: mysqladmin ping -h 127.0.0.1 -u ${uval} --password=${pval}
+      test: mariadb-admin ping -h 127.0.0.1 -u ${uval} --password=${pval}
       start_period: 5s
       interval: 5s
       timeout: 5s