Merge pull request #444 from manala/elao.app.docker/mariadb-11.4

[Elao - App - Docker] MariaDB 11.4
manala · Sep 20, 2024 · 0b05e31 · 0b05e31
2 parents 8ce6c89 + abc1796
commit 0b05e31
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/elao.app.docker/.manala.yaml b/elao.app.docker/.manala.yaml
@@ -116,7 +116,7 @@ system:
             version: ~
     mariadb:
         # @option {"label": "MariaDB version"}
-        # @schema {"enum": [null, 10.11, 10.6, 10.5, 10.4, 10.3, 10.2, 10.1]}
+        # @schema {"enum": [null, 11.4, 10.11, 10.6, 10.5, 10.4, 10.3, 10.2, 10.1]}
         version: ~
     mysql:
         # @option {"label": "MySQL version"}

diff --git a/elao.app.docker/.manala/docker/services/mariadb/compose.yaml.tmpl b/elao.app.docker/.manala/docker/services/mariadb/compose.yaml.tmpl
@@ -11,9 +11,14 @@ services:
             MYSQL_ALLOW_EMPTY_PASSWORD: "yes"
         network_mode: service:app
         healthcheck:
+            {{- if le (.Vars.system.mariadb.version|float64) 10.1 }}
             test: mysqladmin ping --silent --host 0.0.0.0
-            interval: 30s
-            timeout: 30s
+            {{- else }}
+            # See: https://mariadb.com/kb/en/using-healthcheck-sh/
+            test: healthcheck.sh --connect --innodb_initialized
+            {{- end }}
+            interval: 10s
+            timeout: 5s
             retries: 3
             start_period: 0s
 

diff --git a/elao.app.docker/README.md b/elao.app.docker/README.md
@@ -254,7 +254,7 @@ system:
     #             command=/bin/foo
     # MariaDB
     mariadb:
-        version: 10.11
+        version: 11.4
     # ...*OR* MySQL...
     mysql:
         version: "8.0"

diff --git a/elao.app.docker/test/.manala.yaml b/elao.app.docker/test/.manala.yaml
@@ -77,7 +77,7 @@ system:
         packages:
             - package: sass
     mariadb:
-        version: 10.11
+        version: 11.4
     redis:
         version: "*"
     elasticsearch: