diff --git a/podman-framadate/10_install.sh b/podman-framadate/10_install.sh index ff4e195..867512e 100755 --- a/podman-framadate/10_install.sh +++ b/podman-framadate/10_install.sh @@ -34,7 +34,7 @@ export listen_port podman pull ${framadate_image}:${framadate_version} podman pull docker.io/library/php:7-apache && podman pull docker.io/library/mysql:5.7 && -podman-compose up -d && +podman-compose --pod-args "--infra=true --infra-name=${project_name}_infra --share=" --podman-run-args "--requires=${project_name}_infra" up -d && echo -n "Waiting for initialization to end... " && ( podman logs -f framadate-app 2>&1 & ) | grep -q 'configured -- resuming normal operations' && echo "OK" && diff --git a/podman-framadate/vars.sh b/podman-framadate/vars.sh index 76cd45b..a2862c3 100644 --- a/podman-framadate/vars.sh +++ b/podman-framadate/vars.sh @@ -12,7 +12,7 @@ GARBAYE_FRAMADATE_ADMIN_MAIL="${GARBAYE_FRAMADATE_ENV_ADMIN_MAIL:-contact-framad envvars='GARBAYE_FRAMADATE_ADMIN_PASSWORD GARBAYE_FRAMADATE_MYSQL_ROOT_PASSWORD GARBAYE_FRAMADATE_MYSQL_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_FRAMADATE_SMTP_SERVER upstream_images="${framadate_image} localhost/framadate-app docker.io/library/composer docker.io/library/mysql docker.io/library/php docker.io/library/composer" diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh index 27f5d0d..b448a07 100755 --- a/podman-jitsi/10_install.sh +++ b/podman-jitsi/10_install.sh @@ -65,7 +65,7 @@ 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 && +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 logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' &&