Garbaye/services-garbaye
3
1
Fork 0
Code Issues 5 Pull requests Packages Projects Releases Wiki Activity

Jitsi : prep pour podman-compose et podman 4.1+

Browse source
This commit is contained in:
Gitouche 2022-11-04 13:07:13 +01:00
parent 938b3128b0
commit 4add93f316
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
podman-jitsi/10_install.sh
View file

@ -62,7 +62,11 @@ echo "ENABLE_IPV6=0" >> .env
export listen_if export listen_if
export listen_port export listen_port
# podman-compose 0.1.x + podman 4.0
podman-compose --podman-run-args "--env-file .env" up -d && 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 # Wait for web to be up
( podman logs --tail=3 -f podman-jitsi_web_1 2>&1 & ) | grep -q '^\[services.d\] done.$' && ( 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 && podman cp assets/welcome-background.png podman-jitsi_web_1:/usr/share/jitsi-meet/images/welcome-background.png &&

3
podman-jitsi/vars.sh
View file

@ -7,7 +7,10 @@ listen_port="${GARBAYE_JITSI_ENV_LISTENPORT:-8085}"
GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}" GARBAYE_JITSI_URL="${GARBAYE_JITSI_ENV_URL:-https://jitsi.garbaye.fr}"
## internal vars : do not touch ## internal vars : do not touch
project_name=${PWD##*/} project_name=${PWD##*/}
# podman-compose 0.1.x + podman 4.0
pod_name="${project_name}" pod_name="${project_name}"
# podman-compose 1.0.4 (devel) + podman 4.1+
# pod_name='pod_podman-jitsi'
service_name="pod-${pod_name}.service" service_name="pod-${pod_name}.service"
get_default_iface_ipv4 GARBAYE_JITSI_PRIV_IP 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" 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"