From 1c1dae3e5b0304414c7b558402fce8b6491225a4 Mon Sep 17 00:00:00 2001
From: KsmoinO <99479-KsmoinO@users.noreply.framagit.org>
Date: Sat, 5 Nov 2022 18:56:11 +0100
Subject: [PATCH] Migration gitea podman 4.1

---
 podman-gitea/10_install.sh | 2 +-
 podman-gitea/vars.sh       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/podman-gitea/10_install.sh b/podman-gitea/10_install.sh
index 06e93b4..ed2637e 100755
--- a/podman-gitea/10_install.sh
+++ b/podman-gitea/10_install.sh
@@ -55,7 +55,7 @@ podman image exists ${gitea_image}:${gitea_version} &&
 podman pull ${postgres_image}:${postgres_version} &&
 # force refresh of app.ini
 podman unshare rm -f `get_podman_volume_path ${datavolume}`/gitea/conf/app.ini
-podman-compose --podman-run-args "--env-file .env" up -d &&
+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 gitea to finish starting " &&
 ( podman logs -f ${container_name} 2>&1 & ) | grep -q 'NewServer()' &&
 echo "OK" &&
diff --git a/podman-gitea/vars.sh b/podman-gitea/vars.sh
index 1265b15..908c21a 100644
--- a/podman-gitea/vars.sh
+++ b/podman-gitea/vars.sh
@@ -17,6 +17,7 @@ envvars='GARBAYE_GITEA_POSTGRES_PASSWORD'
 ## internal vars : do not touch
 project_name=${PWD##*/}
 pod_name="${project_name}"
+pod_name="pod_${project_name}"
 service_name="pod-${pod_name}.service"
 get_default_iface_ipv4 GARBAYE_GITEA_SMTP_SERVER
 upstream_images="${gitea_image} ${postgres_image}"