From 7090529936366bc34f454a808396f4f04f8b1da9 Mon Sep 17 00:00:00 2001
From: Gitouche <guigui.benmaurice@gmail.com>
Date: Tue, 11 Jun 2024 22:04:14 +0200
Subject: [PATCH] fix podman-compose + python (5/x)

---
 functions.sh                     | 1 -
 podman-jitsi/10_install.sh       | 2 +-
 podman-matrix/10_install.sh      | 2 +-
 podman-seafile/10_install.sh     | 2 +-
 podman-vaultwarden/10_install.sh | 2 +-
 podman-wpamapsta/10_install.sh   | 2 +-
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/functions.sh b/functions.sh
index 4ca9c33..0a6bc3e 100644
--- a/functions.sh
+++ b/functions.sh
@@ -361,4 +361,3 @@ if [[ ! -z ${podman_compose_path} ]]; then
         fi
     done
 fi
-}
diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index 994a9ae..1f9fe1d 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -67,7 +67,7 @@ echo "COLIBRI_REST_ENABLED=1" >> .env
 export listen_if
 export listen_port
 
-python3.9 podman-compose --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
+${my_podman_compose} --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 
 # Wait for web to be up
 ( podman container logs --tail=3 -f ${project_name}_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
diff --git a/podman-matrix/10_install.sh b/podman-matrix/10_install.sh
index 0a3f456..d257f58 100755
--- a/podman-matrix/10_install.sh
+++ b/podman-matrix/10_install.sh
@@ -38,7 +38,7 @@ if ! podman image exists ${synapse_image}:${synapse_version}; then
     podman image pull ${synapse_image}:${synapse_version} || exit 1
 fi
 podman image pull ${postgres_image}:${postgres_version} &&
-python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
+${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 
 end=$((SECONDS+120))
 while [ $SECONDS -lt $end ]; do
diff --git a/podman-seafile/10_install.sh b/podman-seafile/10_install.sh
index 8ecca10..de92bbc 100755
--- a/podman-seafile/10_install.sh
+++ b/podman-seafile/10_install.sh
@@ -41,7 +41,7 @@ if ! podman image exists ${seafile_image}:${seafile_release}; then
 fi
 podman image pull docker.io/library/memcached:${memcached_release} &&
 podman image pull docker.io/library/mariadb:${mariadb_release} &&
-python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
+${my_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 seahub_settings.py " &&
 while [ ! -e `get_podman_volume_path ${datavolume}`/seafile/conf/seahub_settings.py ]; do
     echo -n "."
diff --git a/podman-vaultwarden/10_install.sh b/podman-vaultwarden/10_install.sh
index 48c5c34..f149f24 100755
--- a/podman-vaultwarden/10_install.sh
+++ b/podman-vaultwarden/10_install.sh
@@ -40,7 +40,7 @@ export listen_port
 if ! podman image exists ${service_image}:${service_version}; then
     podman image pull ${service_image}:${service_version} || exit 1
 fi
-python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
+${my_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 vaultwarden to finish starting " &&
 ( podman container logs -f ${container_name} 2>&1 & ) | grep -q 'Rocket has launched from ' &&
 echo "OK" &&
diff --git a/podman-wpamapsta/10_install.sh b/podman-wpamapsta/10_install.sh
index 92a4c4d..9f8dca4 100755
--- a/podman-wpamapsta/10_install.sh
+++ b/podman-wpamapsta/10_install.sh
@@ -35,7 +35,7 @@ if ! podman image exists ${wp_image}:${wp_version}; then
 fi
 podman image pull ${mysql_image}:${mysql_version} &&
 
-python3.9 podman-compose --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
+${my_podman_compose} --pod-args="--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra --env-file .env" up -d &&
 sleep 10 # TODO : wait for healthckeck on mariadb
 shred -u .env &&
 podman pod stop ${pod_name}