jvb: run it on the user defined network

pull/3/head
Saúl Ibarra Corretgé 7 years ago
parent 67243fbdcb
commit 8e4325829b
  1. 8
      docker-compose.yml
  2. 2
      jvb/rootfs/defaults/sip-communicator.properties
  3. 9
      jvb/rootfs/etc/cont-init.d/10-config

@ -23,8 +23,6 @@ services:
- '5222' - '5222'
- '5347' - '5347'
- '5280' - '5280'
ports:
- '127.0.0.1:5347:5347'
volumes: volumes:
- ${CONFIG}/prosody:/config - ${CONFIG}/prosody:/config
environment: environment:
@ -63,13 +61,15 @@ services:
volumes: volumes:
- ${CONFIG}/jvb:/config - ${CONFIG}/jvb:/config
environment: environment:
- DOCKER_HOST_ADDRESS
- XMPP_DOMAIN - XMPP_DOMAIN
- XMPP_SERVER=127.0.0.1 - XMPP_SERVER=xmpp.meet.jitsi
- JVB_COMPONENT_SECRET - JVB_COMPONENT_SECRET
- JVB_STUN_SERVERS - JVB_STUN_SERVERS
- JICOFO_AUTH_USER - JICOFO_AUTH_USER
- TZ - TZ
network_mode: 'host' networks:
meet.jitsi:
# Custom network so all services can communicate using a FQDN # Custom network so all services can communicate using a FQDN
networks: networks:

@ -1,3 +1,5 @@
org.jitsi.videobridge.AUTHORIZED_SOURCE_REGEXP=${JICOFO_AUTH_USER}@auth.${XMPP_DOMAIN}/.* org.jitsi.videobridge.AUTHORIZED_SOURCE_REGEXP=${JICOFO_AUTH_USER}@auth.${XMPP_DOMAIN}/.*
org.jitsi.videobridge.TCP_HARVESTER_PORT=4443 org.jitsi.videobridge.TCP_HARVESTER_PORT=4443
org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=${JVB_STUN_SERVERS} org.ice4j.ice.harvest.STUN_MAPPING_HARVESTER_ADDRESSES=${JVB_STUN_SERVERS}
org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=
org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=

@ -13,3 +13,12 @@ if [[ ! -f /config/logging.properties ]]; then
cp /defaults/logging.properties /config cp /defaults/logging.properties /config
fi fi
# Do this for every run, since the local IP may change!
if [[ ! -z "$DOCKER_HOST_ADDRESS" ]]; then
LOCAL_ADDRESS=$(hostname -I | cut -d " " -f1)
sed -i \
-e "s,^org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=.*,org.ice4j.ice.harvest.NAT_HARVESTER_LOCAL_ADDRESS=$LOCAL_ADDRESS," \
-e "s,^org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=.*,org.ice4j.ice.harvest.NAT_HARVESTER_PUBLIC_ADDRESS=$DOCKER_HOST_ADDRESS," \
/config/sip-communicator.properties
fi

Loading…
Cancel
Save