diff options
| -rw-r--r-- | app/build/docker-compose.yml | 2 | ||||
| -rwxr-xr-x | app/build/jitsi-videobridge/jvb_run | 3 | ||||
| -rw-r--r-- | app/deployment/jitsi.hcl | 14 | ||||
| -rw-r--r-- | app/integration/jitsi/01_gen_certs.yml | 2 | ||||
| -rw-r--r-- | app/integration/jitsi/02_run.yml | 2 |
5 files changed, 9 insertions, 14 deletions
diff --git a/app/build/docker-compose.yml b/app/build/docker-compose.yml index e3cbca9..25e994f 100644 --- a/app/build/docker-compose.yml +++ b/app/build/docker-compose.yml @@ -53,7 +53,7 @@ services: # https://github.com/jitsi/jitsi-videobridge PREFIXV: stable/jitsi-meet_ VERSION: 4966 - image: superboum/amd64_jitsi_videobridge:v10 + image: superboum/amd64_jitsi_videobridge:v11 jitsi-xmpp: build: diff --git a/app/build/jitsi-videobridge/jvb_run b/app/build/jitsi-videobridge/jvb_run index 3352e8a..4514d99 100755 --- a/app/build/jitsi-videobridge/jvb_run +++ b/app/build/jitsi-videobridge/jvb_run @@ -35,4 +35,5 @@ EOF --host=${JITSI_PROSODY_HOST} \ --domain=jitsi.deuxfleurs.fr \ --port=5347 \ - --secret=${JITSI_SECRET_VIDEOBRIDGE} + --secret=${JITSI_SECRET_VIDEOBRIDGE} \ + --apis=rest,xmpp diff --git a/app/deployment/jitsi.hcl b/app/deployment/jitsi.hcl index 4ef2f98..8f98d61 100644 --- a/app/deployment/jitsi.hcl +++ b/app/deployment/jitsi.hcl @@ -1,9 +1,3 @@ -/* - * WIP WIP WIP WIP - * - * + NEED TO SET ENV VARIABLES - */ - job "jitsi" { datacenters = ["dc1"] type = "service" @@ -17,7 +11,7 @@ job "jitsi" { task "xmpp" { driver = "docker" config { - image = "superboum/amd64_jitsi_xmpp:v1" + image = "superboum/amd64_jitsi_xmpp:v2" network_mode = "host" port_map { xmpp_port = 5222 @@ -93,7 +87,7 @@ job "jitsi" { task "front" { driver = "docker" config { - image = "superboum/amd64_jitsi_front:v5" + image = "superboum/amd64_jitsi_meet:v1" network_mode = "host" port_map { https_port = 443 @@ -157,7 +151,7 @@ job "jitsi" { task "jicofo" { driver = "docker" config { - image = "superboum/amd64_jitsi_conference_focus:v2" + image = "superboum/amd64_jitsi_conference_focus:v3" network_mode = "host" } @@ -189,7 +183,7 @@ job "jitsi" { task "videobridge" { driver = "docker" config { - image = "superboum/amd64_jitsi_videobridge:v9" + image = "superboum/amd64_jitsi_videobridge:v10" network_mode = "host" port_map { video1_port = 8080 diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml index c283f53..2ba3d1d 100644 --- a/app/integration/jitsi/01_gen_certs.yml +++ b/app/integration/jitsi/01_gen_certs.yml @@ -1,7 +1,7 @@ version: '3' services: jitsi-xmpp: - image: ./jitsi-xmpp + image: ./jitsi-xmpp:v2 command: ["/usr/local/bin/xmpp_gen"] volumes: [ './jitsi-certs/:/certs:rw' ] env_file: [ 'dev.env' ] diff --git a/app/integration/jitsi/02_run.yml b/app/integration/jitsi/02_run.yml index 79127cb..354a548 100644 --- a/app/integration/jitsi/02_run.yml +++ b/app/integration/jitsi/02_run.yml @@ -20,7 +20,7 @@ services: env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - image: superboum/amd64_jitsi_videobridge:v10 + image: superboum/amd64_jitsi_videobridge:v11 network_mode: host ports: - "8080:8080/tcp" |