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

Jitsi : gitea

Browse source
This commit is contained in:
Gitouche 2022-08-12 21:01:57 +02:00
parent 5a593f755c
commit c9883a66ea
5 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
podman-jitsi/.gitlab-ci.yml
View file

@ -7,6 +7,7 @@ jitsi:
stage: test stage: test
script: script:
- cd podman-jitsi - cd podman-jitsi
- ./ci_build-images.sh
- GARBAYE_JITSI_ENV_LISTENPORT=18085 ./10_install.sh - GARBAYE_JITSI_ENV_LISTENPORT=18085 ./10_install.sh
- ./20_enable.sh - ./20_enable.sh
- ./30_start.sh && sleep 10 - ./30_start.sh && sleep 10

5
podman-jitsi/10_install.sh
View file

@ -14,7 +14,9 @@ if [[ -d ~/${confvolume} ]]; then
exit 1 exit 1
fi fi
source ${ABSDIR}/zz_build-images.sh for image in ${upstream_images}; do
podman image pull ${image}:${version}
done &&
mkdir -p ~/${confvolume}/{web/letsencrypt,web/crontabs,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri} mkdir -p ~/${confvolume}/{web/letsencrypt,web/crontabs,transcripts,prosody/config,prosody/prosody-plugins-custom,jicofo,jvb,jigasi,jibri}
@ -37,6 +39,7 @@ cp env.example .env
./gen-passwords.sh ./gen-passwords.sh
# Patch docker-compose.yml # Patch 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 "^ - '\${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 "^ - '\${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 sed_in_place "^ - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" "# - '127.0.0.1:\${JVB_COLIBRI_PORT:-8080}:8080'" docker-compose.yml

4
podman-jitsi/50_update.sh
View file

@ -13,7 +13,9 @@ ensure_systemd_unit_exists ${service_name}
current_version=$(podman ps -a --format "{{.Image}}" | grep prosody | awk -F: '{print $NF}') current_version=$(podman ps -a --format "{{.Image}}" | grep prosody | awk -F: '{print $NF}')
reinstall_please () { reinstall_please () {
source ${ABSDIR}/zz_build-images.sh for image in ${upstream_images}; do
podman image pull ${image}:${version}
done &&
check_pod_running ${pod_name} && ./40_stop.sh check_pod_running ${pod_name} && ./40_stop.sh
./70_disable.sh && \ ./70_disable.sh && \
./80_destroy.sh && \ ./80_destroy.sh && \

16
podman-jitsi/zz_build-images.sh → podman-jitsi/ci_build-images.sh
View file

@ -24,21 +24,21 @@ build_base() {
mkdir ${buildfolder} && mkdir ${buildfolder} &&
curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${version}.tar.gz" | tar xz --strip-components 1 -C ${buildfolder}/ && { curl -sSfL -- "https://github.com/jitsi/docker-jitsi-meet/archive/refs/tags/${version}.tar.gz" | tar xz --strip-components 1 -C ${buildfolder}/ && {
if ! podman image exists localhost/jitsi/jvb:${version}; then if ! podman image exists git.garbaye.fr/garbaye/jitsi-jvb:${version}; then
build_base build_base
podman build -t localhost/jitsi/jvb:${version} ${buildfolder}/jvb/ || exit -1 podman build -t git.garbaye.fr/garbaye/jitsi-jvb:${version} ${buildfolder}/jvb/ || exit -1
fi fi
if ! podman image exists localhost/jitsi/jicofo:${version}; then if ! podman image exists git.garbaye.fr/garbaye/jitsi-jicofo:${version}; then
build_base build_base
podman build -t localhost/jitsi/jicofo:${version} ${buildfolder}/jicofo/ || exit -1 podman build -t git.garbaye.fr/garbaye/jitsi-jicofo:${version} ${buildfolder}/jicofo/ || exit -1
fi fi
if ! podman image exists localhost/jitsi/prosody:${version}; then if ! podman image exists git.garbaye.fr/garbaye/jitsi-prosody:${version}; then
build_base build_base
podman build -t localhost/jitsi/prosody:${version} ${buildfolder}/prosody/ || exit -1 podman build -t git.garbaye.fr/garbaye/jitsi-prosody:${version} ${buildfolder}/prosody/ || exit -1
fi fi
if ! podman image exists localhost/jitsi/web:${version}; then if ! podman image exists git.garbaye.fr/garbaye/jitsi-web:${version}; then
build_base build_base
podman build -t localhost/jitsi/web:${version} ${buildfolder}/web/ || exit -1 podman build -t git.garbaye.fr/garbaye/jitsi-web:${version} ${buildfolder}/web/ || exit -1
fi fi
dangling_images=$(podman images -f "dangling=true" -q) dangling_images=$(podman images -f "dangling=true" -q)
test ! -z ${dangling_images} && podman rmi -f "${dangling_images}" test ! -z ${dangling_images} && podman rmi -f "${dangling_images}"

2
podman-jitsi/vars.sh
View file

@ -2,7 +2,7 @@
pod_name='podman-jitsi' pod_name='podman-jitsi'
service_name="pod-${pod_name}.service" service_name="pod-${pod_name}.service"
upstream_images="localhost/jitsi/jvb localhost/jitsi/jicofo localhost/jitsi/prosody localhost/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"
version='stable-7577-2' version='stable-7577-2'
confvolume='.jitsi-meet-cfg' confvolume='.jitsi-meet-cfg'
listen_if="${GARBAYE_JITSI_ENV_LISTENIF:-127.0.0.1}" listen_if="${GARBAYE_JITSI_ENV_LISTENIF:-127.0.0.1}"