From e240d4dbca96c85ed817f52361ce491f593a7ac4 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Fri, 12 Aug 2022 21:08:18 +0200 Subject: [PATCH] Jitsi : gitea 2 --- podman-jitsi/10_install.sh | 4 ++-- podman-jitsi/50_update.sh | 2 +- podman-jitsi/ci_build-images.sh | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/podman-jitsi/10_install.sh b/podman-jitsi/10_install.sh index 1b1cd71..9f929e6 100755 --- a/podman-jitsi/10_install.sh +++ b/podman-jitsi/10_install.sh @@ -15,7 +15,7 @@ if [[ -d ~/${confvolume} ]]; then fi for image in ${upstream_images}; do - podman image pull ${image}:${version} + podman image pull ${image}:${version} || exit 1 done && mkdir -p ~/${confvolume}/{web/letsencrypt,web/crontabs,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri} @@ -39,7 +39,7 @@ cp env.example .env ./gen-passwords.sh # Patch docker-compose.yml -sed_in_place "image: jitsi/" "image: git-garbaye.fr/garbaye/jitsi-" docker-compose.yml +sed_in_place "image: jitsi/" "image: git.garbaye.fr/garbaye/jitsi-" docker-compose.yml sed_in_place "^ - '\${HTTP_PORT}:80'" " - '\${listen_if}:\${HTTP_PORT}:80'" docker-compose.yml sed_in_place "^ - '\${HTTPS_PORT}:443'" "# - '\${HTTPS_PORT}:443'" docker-compose.yml sed_in_place "^ - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" "# - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" docker-compose.yml diff --git a/podman-jitsi/50_update.sh b/podman-jitsi/50_update.sh index de229a2..3e0dc7f 100755 --- a/podman-jitsi/50_update.sh +++ b/podman-jitsi/50_update.sh @@ -14,7 +14,7 @@ current_version=$(podman ps -a --format "{{.Image}}" | grep prosody | awk -F: '{ reinstall_please () { for image in ${upstream_images}; do - podman image pull ${image}:${version} + podman image pull ${image}:${version} || exit 1 done && check_pod_running ${pod_name} && ./40_stop.sh ./70_disable.sh && \ diff --git a/podman-jitsi/ci_build-images.sh b/podman-jitsi/ci_build-images.sh index 1444544..c0b9d17 100755 --- a/podman-jitsi/ci_build-images.sh +++ b/podman-jitsi/ci_build-images.sh @@ -47,3 +47,7 @@ curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${ve podman rmi localhost/jitsi/base:${version} localhost/jitsi/base:latest fi } ; rm -rf ${buildfolder} + +for image in ${upstream_images}; do + oci_push_to_registry ${image}:${version} +done &&