From 2b42ce10b66c97412b48879609d3959e010d2a66 Mon Sep 17 00:00:00 2001 From: Gitouche <26656-gitouche@users.noreply.framagit.org> Date: Sat, 3 Sep 2022 15:26:40 +0200 Subject: [PATCH] Peerjs : use service_name. Prep pour podman-compose 1.+ --- podman-peerjs/.gitlab-ci.yml | 4 ++-- podman-peerjs/vars.sh | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/podman-peerjs/.gitlab-ci.yml b/podman-peerjs/.gitlab-ci.yml index 226f4a2..0f735cd 100644 --- a/podman-peerjs/.gitlab-ci.yml +++ b/podman-peerjs/.gitlab-ci.yml @@ -1,6 +1,6 @@ before_script: - - podman container exists peerjs-server && podman container rm --force peerjs-server - - rm -f ~/.config/systemd/user/container-peerjs-server.service && systemctl --user daemon-reload + - podman container exists podman-peerjs && podman container rm --force podman-peerjs + - rm -f ~/.config/systemd/user/container-podman-peerjs.service && systemctl --user daemon-reload peerjs: stage: test diff --git a/podman-peerjs/vars.sh b/podman-peerjs/vars.sh index 3274af0..9700fd4 100644 --- a/podman-peerjs/vars.sh +++ b/podman-peerjs/vars.sh @@ -1,8 +1,11 @@ #!/usr/bin/env bash - -container_name='peerjs-server' -service_name="container-${container_name}.service" -listen_if="${GARBAYE_PEERJS_ENV_LISTENIF:-127.0.0.1}" -listen_port="${GARBAYE_PEERJS_ENV_LISTENPORT:-8081}" +## vars upstream_images='git.garbaye.fr/garbaye/peerjs-server' version='0.6.1' +## default vars : override with ENV var +listen_if="${GARBAYE_PEERJS_ENV_LISTENIF:-127.0.0.1}" +listen_port="${GARBAYE_PEERJS_ENV_LISTENPORT:-8081}" +## internal vars : do not touch +project_name=${PWD##*/} +container_name="${project_name}" +service_name="container-${container_name}.service"