diff options
| author | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-27 09:02:49 +0100 |
|---|---|---|
| committer | Quentin Dufour <quentin@deuxfleurs.fr> | 2020-03-27 09:02:49 +0100 |
| commit | a95017cf1e1761fef1ec029105d1c25f954741d4 (patch) | |
| tree | 5e3b2e7f6ad788ef8a0f785056400442bb4d1cc7 | |
| parent | 8fe3a046a480cf4ea8e19228d408265c279eeff9 (diff) | |
| download | infrastructure-a95017cf1e1761fef1ec029105d1c25f954741d4.tar.gz infrastructure-a95017cf1e1761fef1ec029105d1c25f954741d4.zip | |
Add tags and hostnamefeature/jitsi
| -rw-r--r-- | docker/jitsi/02_run.yml | 8 | ||||
| -rw-r--r-- | docker/jitsi/README.md | 6 | ||||
| -rw-r--r-- | docker/jitsi/dev.env | 4 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-conference-focus/jicofo | 1 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-videobridge/jvb_run | 1 | ||||
| -rwxr-xr-x | docker/jitsi/jitsi-xmpp/xmpp_conf | 1 |
6 files changed, 19 insertions, 2 deletions
diff --git a/docker/jitsi/02_run.yml b/docker/jitsi/02_run.yml index 297682c..af615a9 100644 --- a/docker/jitsi/02_run.yml +++ b/docker/jitsi/02_run.yml @@ -2,6 +2,8 @@ version: '3' services: jitsi-xmpp: build: ./jitsi-xmpp + image: superboum/amd64_jitsi_xmpp:v1 + network_mode: host ports: - "5222:5222" - "5347:5347" @@ -10,16 +12,22 @@ services: volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-front: build: ./jitsi-front + image: superboum/amd64_jitsi_front:v1 + network_mode: host ports: - "443:443" env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-conference-focus: build: ./jitsi-conference-focus + image: superboum/amd64_jitsi_conference_focus:v1 + network_mode: host env_file: [ 'dev.env' ] volumes: [ './jitsi-certs/:/certs:ro' ] jitsi-videobridge: build: ./jitsi-videobridge + image: superboum/amd64_jitsi_videobridge:v1 + network_mode: host ports: - "4443:4443" - "10000:10000/udp" diff --git a/docker/jitsi/README.md b/docker/jitsi/README.md index ea90274..70b59fc 100644 --- a/docker/jitsi/README.md +++ b/docker/jitsi/README.md @@ -18,3 +18,9 @@ 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/docker/jitsi/dev.env b/docker/jitsi/dev.env index cebe2a7..722ca1d 100644 --- a/docker/jitsi/dev.env +++ b/docker/jitsi/dev.env @@ -2,8 +2,8 @@ JITSI_SECRET_VIDEOBRIDGE=S3CR3T01 JITSI_SECRET_JICOFO_COMPONENT=S3CR3T02 JITSI_SECRET_JICOFO_USER=S3CR3T03 JITSI_PROSODY_BOSH_PORT=5280 -JITSI_PROSODY_BOSH_HOST=172.17.0.1 -JITSI_PROSODY_HOST=172.17.0.1 +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 diff --git a/docker/jitsi/jitsi-conference-focus/jicofo b/docker/jitsi/jitsi-conference-focus/jicofo index 88ea76c..2bc6e3f 100755 --- a/docker/jitsi/jitsi-conference-focus/jicofo +++ b/docker/jitsi/jitsi-conference-focus/jicofo @@ -5,6 +5,7 @@ update-ca-certificates -f cat >> /etc/hosts <<EOF ${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +127.0.0.1 `hostname` EOF /srv/jicofo/jicofo.sh \ diff --git a/docker/jitsi/jitsi-videobridge/jvb_run b/docker/jitsi/jitsi-videobridge/jvb_run index dcd3cab..2431081 100755 --- a/docker/jitsi/jitsi-videobridge/jvb_run +++ b/docker/jitsi/jitsi-videobridge/jvb_run @@ -2,6 +2,7 @@ cat >> /etc/hosts <<EOF ${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +127.0.0.1 `hostname` EOF cd /srv/jvb diff --git a/docker/jitsi/jitsi-xmpp/xmpp_conf b/docker/jitsi/jitsi-xmpp/xmpp_conf index 5ab4a20..2a9278e 100755 --- a/docker/jitsi/jitsi-xmpp/xmpp_conf +++ b/docker/jitsi/jitsi-xmpp/xmpp_conf @@ -2,6 +2,7 @@ cat >> /etc/hosts <<EOF ${JITSI_PROSODY_HOST} jitsi.deuxfleurs.fr conference.jitsi.deuxfleurs.fr jitsi-videobridge.jitsi.deuxfleurs.fr focus.jitsi.deuxfleurs.fr auth.jitsi.deuxfleurs.fr +127.0.0.1 `hostname` EOF mkdir -p /etc/prosody/conf.{d,avail}/ |