From 79dd00d85d94bee5aea1d88905e9d1ea3f11fdfb Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Wed, 15 Feb 2023 22:33:57 +0100
Subject: [PATCH] framadate : switch to mariadb

---
 podman-framadate/10_install.sh      | 4 +++-
 podman-framadate/docker-compose.yml | 2 +-
 podman-framadate/vars.sh            | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/podman-framadate/10_install.sh b/podman-framadate/10_install.sh
index ddd0e08..b81468b 100755
--- a/podman-framadate/10_install.sh
+++ b/podman-framadate/10_install.sh
@@ -28,13 +28,15 @@ EOT
 
 export framadate_image
 export framadate_version
+export mysql_image
+export mysql_version
 export listen_if
 export listen_port
 
 if ! podman image exists ${framadate_image}:${framadate_version}; then
     podman pull ${framadate_image}:${framadate_version}
 fi
-podman pull docker.io/library/mysql:5.7 &&
+podman pull ${mysql_image}:${mysql_version} &&
 
 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 echo -n "Waiting for initialization to end... " &&
diff --git a/podman-framadate/docker-compose.yml b/podman-framadate/docker-compose.yml
index a15c106..e7f16da 100644
--- a/podman-framadate/docker-compose.yml
+++ b/podman-framadate/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3'
 services:
     framadate-db:
         container_name: framadate-db
-        image: docker.io/library/mysql:5.7
+        image: "${mysql_image}:${mysql_version}"
         environment:
             - MYSQL_USER=framadate
             - MYSQL_DATABASE=framadate
diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh
index 2c2ecf3..a62490b 100644
--- a/podman-framadate/vars.sh
+++ b/podman-framadate/vars.sh
@@ -2,6 +2,8 @@
 ## vars
 framadate_image='git.garbaye.fr/garbaye/framadate-app'
 framadate_version='1.1.19'
+mysql_image='docker.io/library/mariadb'
+mysql_version='10.10'
 ## default vars : override with ENV var
 listen_if="${GARBAYE_FRAMADATE_ENV_LISTENIF:-127.0.0.1}"
 listen_port="${GARBAYE_FRAMADATE_ENV_LISTENPORT:-8087}"