From a23e08ce20887efb4e158a02ffee1f775a0db89f Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 20:17:07 +0200 Subject: Refactor 2 --- app/integration/jitsi/01_gen_certs.yml | 8 ++++++++ app/integration/jitsi/02_run.yml | 30 ++++++++++++++++++++++++++++ app/integration/jitsi/README.md | 26 ++++++++++++++++++++++++ app/integration/jitsi/dev.env | 10 ++++++++++ app/integration/jitsi/jitsi-certs/.gitignore | 2 ++ 5 files changed, 76 insertions(+) create mode 100644 app/integration/jitsi/01_gen_certs.yml create mode 100644 app/integration/jitsi/02_run.yml create mode 100644 app/integration/jitsi/README.md create mode 100644 app/integration/jitsi/dev.env create mode 100644 app/integration/jitsi/jitsi-certs/.gitignore (limited to 'app/integration/jitsi') diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml new file mode 100644 index 0000000..c283f53 --- /dev/null +++ b/app/integration/jitsi/01_gen_certs.yml @@ -0,0 +1,8 @@ +version: '3' +services: + jitsi-xmpp: + image: ./jitsi-xmpp + 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 new file mode 100644 index 0000000..79127cb --- /dev/null +++ b/app/integration/jitsi/02_run.yml @@ -0,0 +1,30 @@ +version: '3.4' +services: + jitsi-xmpp: + image: superboum/amd64_jitsi_xmpp:v2 + network_mode: host + ports: + - "5222:5222" + - "5347:5347" + - "5280:5280" + env_file: [ 'dev.env' ] + volumes: [ './jitsi-certs/:/certs:ro' ] + jitsi-meet: + image: superboum/amd64_jitsi_meet:v1 + ports: + - "443:443" + env_file: [ 'dev.env' ] + volumes: [ './jitsi-certs/:/certs:ro' ] + jitsi-conference-focus: + image: superboum/amd64_jitsi_conference_focus:v3 + env_file: [ 'dev.env' ] + volumes: [ './jitsi-certs/:/certs:ro' ] + jitsi-videobridge: + image: superboum/amd64_jitsi_videobridge:v10 + network_mode: host + ports: + - "8080:8080/tcp" + - "10000:10000/udp" + env_file: [ 'dev.env' ] + volumes: [ './jitsi-certs/:/certs:ro' ] + diff --git a/app/integration/jitsi/README.md b/app/integration/jitsi/README.md new file mode 100644 index 0000000..70b59fc --- /dev/null +++ b/app/integration/jitsi/README.md @@ -0,0 +1,26 @@ +This installation is inspired by: https://github.com/jitsi/jitsi-meet/blob/master/doc/manual-install.md + +To build images: + +``` +docker-compose -f 02_run.yml build +``` + +To gen the certs: + +``` +docker-compose -f 01_gen_certs.yml up --force-recreate +``` + +To run the stack: + + +``` +docker-compose -f 02_run.yml up --force-recreate +``` + +To push the stack on the docker registry: + +``` +docker-compose -f 02_run.yml push +``` diff --git a/app/integration/jitsi/dev.env b/app/integration/jitsi/dev.env new file mode 100644 index 0000000..4fff8c1 --- /dev/null +++ b/app/integration/jitsi/dev.env @@ -0,0 +1,10 @@ +JITSI_SECRET_VIDEOBRIDGE=S3CR3T01 +JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 +JITSI_SECRET_JICOFO_USER=S3CR3T03 +JITSI_PROSODY_BOSH_PORT=5280 +JITSI_PROSODY_BOSH_HOST=127.0.0.1 +JITSI_PROSODY_HOST=127.0.0.1 +JITSI_CERTS_FOLDER=/certs/ +JITSI_NAT_PUBLIC_IP=77.204.7.239 +JITSI_NAT_LOCAL_IP=192.168.0.18 +JITSI_VIDEO_TCP=8080 diff --git a/app/integration/jitsi/jitsi-certs/.gitignore b/app/integration/jitsi/jitsi-certs/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/app/integration/jitsi/jitsi-certs/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore -- cgit v1.2.3 From 1af6eabc81cc5758809dff3997890fc6786f9b3e Mon Sep 17 00:00:00 2001 From: Quentin Date: Sat, 12 Sep 2020 22:18:30 +0200 Subject: Fix videobridge --- app/integration/jitsi/01_gen_certs.yml | 2 +- app/integration/jitsi/02_run.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'app/integration/jitsi') 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" -- cgit v1.2.3 From da034dabfcedcded964b6022153cf5a8a7ae9380 Mon Sep 17 00:00:00 2001 From: Quentin Date: Sun, 13 Sep 2020 11:46:14 +0200 Subject: Finally it seems to work --- app/integration/jitsi/01_gen_certs.yml | 2 +- app/integration/jitsi/02_run.yml | 9 +++------ app/integration/jitsi/dev.env | 8 ++++---- 3 files changed, 8 insertions(+), 11 deletions(-) (limited to 'app/integration/jitsi') diff --git a/app/integration/jitsi/01_gen_certs.yml b/app/integration/jitsi/01_gen_certs.yml index 2ba3d1d..bf73291 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:v2 + image: superboum/amd64_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 354a548..73eefad 100644 --- a/app/integration/jitsi/02_run.yml +++ b/app/integration/jitsi/02_run.yml @@ -1,8 +1,7 @@ version: '3.4' services: jitsi-xmpp: - image: superboum/amd64_jitsi_xmpp:v2 - network_mode: host + image: superboum/amd64_jitsi_xmpp:v3 ports: - "5222:5222" - "5347:5347" @@ -16,15 +15,13 @@ services: env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: - image: superboum/amd64_jitsi_conference_focus:v3 + image: superboum/amd64_jitsi_conference_focus:v4 env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: - image: superboum/amd64_jitsi_videobridge:v11 - network_mode: host + image: superboum/amd64_jitsi_videobridge:v14 ports: - "8080:8080/tcp" - "10000:10000/udp" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] - diff --git a/app/integration/jitsi/dev.env b/app/integration/jitsi/dev.env index 4fff8c1..1dd2122 100644 --- a/app/integration/jitsi/dev.env +++ b/app/integration/jitsi/dev.env @@ -2,9 +2,9 @@ JITSI_SECRET_VIDEOBRIDGE=S3CR3T01 JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 JITSI_SECRET_JICOFO_USER=S3CR3T03 JITSI_PROSODY_BOSH_PORT=5280 -JITSI_PROSODY_BOSH_HOST=127.0.0.1 -JITSI_PROSODY_HOST=127.0.0.1 +JITSI_PROSODY_BOSH_HOST=172.17.0.1 +JITSI_PROSODY_HOST=172.17.0.1 JITSI_CERTS_FOLDER=/certs/ -JITSI_NAT_PUBLIC_IP=77.204.7.239 -JITSI_NAT_LOCAL_IP=192.168.0.18 +JITSI_NAT_PUBLIC_IP=37.164.35.154 +JITSI_NAT_LOCAL_IP=192.168.0.231 JITSI_VIDEO_TCP=8080 -- cgit v1.2.3