From 4add93f31647157cbb087a9f352334d481a4c5c8 Mon Sep 17 00:00:00 2001
From: Gitouche <26656-gitouche@users.noreply.framagit.org>
Date: Fri, 4 Nov 2022 13:07:13 +0100
Subject: [PATCH] Jitsi : prep pour podman-compose et podman 4.1+

---
 podman-jitsi/10_install.sh | 4 ++++
 podman-jitsi/vars.sh       | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh
index 51792e3..eba5b47 100755
--- a/podman-jitsi/10_install.sh
+++ b/podman-jitsi/10_install.sh
@@ -62,7 +62,11 @@ echo "ENABLE_IPV6=0" >> .env
 export listen_if
 export listen_port
 
+# podman-compose 0.1.x + podman 4.0
 podman-compose --podman-run-args "--env-file .env" up -d &&
+# podman-compose 1.0.4 (devel) + podman 4.1+
+# podman-compose --pod-args "--infra=true --infra-name=podman-jitsi_infra --share=" --podman-run-args "--requires=podman-jitsi_infra --env-file .env" up -d &&
+
 # Wait for web to be up
 ( podman logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&
 podman cp assets/welcome-background.png podman-jitsi_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&
diff --git a/podman-jitsi/vars.sh b/podman-jitsi/vars.sh
index 05c07bc..804e251 100644
--- a/podman-jitsi/vars.sh
+++ b/podman-jitsi/vars.sh
@@ -7,7 +7,10 @@ listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}"
 GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"
 ## internal vars : do not touch
 project_name=${PWD##*/}
+# podman-compose 0.1.x + podman 4.0
 pod_name="${project_name}"
+# podman-compose 1.0.4 (devel) + podman 4.1+
+# pod_name='pod_podman-jitsi'
 service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP
 upstream_images="git.garbaye.fr/garbaye/jitsi-jvb git.garbaye.fr/garbaye/jitsi-jicofo git.garbaye.fr/garbaye/jitsi-prosody git.garbaye.fr/garbaye/jitsi-web"