openvidu-server-kms bug fix (KMS_TURN_URL was being overrided)

pull/73/head
pabloFuente 2018-04-18 15:18:12 +02:00
parent d26db5a01c
commit e9089eeb82
2 changed files with 9 additions and 7 deletions

View File

@ -7,15 +7,16 @@ RUN echo "deb http://ubuntu.openvidu.io/6.7.0 xenial kms6" | tee /etc/apt/source
&& apt-get update \
&& apt-get -y dist-upgrade \
&& apt-get -y install kurento-media-server \
&& apt-get -y install openh264-gst-plugins-bad-1.5
&& apt-get -y install openh264-gst-plugins-bad-1.5 \
&& rm -rf /var/lib/apt/lists/*
COPY kms.sh /kms.sh
# Install Java
RUN apt-get install -y openjdk-8-jdk
RUN apt-get update && apt-get install -y openjdk-8-jdk && rm -rf /var/lib/apt/lists/*
# Install supervisor
RUN apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y supervisor && rm -rf /var/lib/apt/lists/*
# Configure supervisor
RUN mkdir -p /var/log/supervisor

View File

@ -1,14 +1,15 @@
#!/bin/bash -x
set -e
if [ -n "$KMS_TURN_URL" ]; then
echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
fi
if [ -n "$KMS_STUN_IP" -a -n "$KMS_STUN_PORT" ]; then
# Generate WebRtcEndpoint configuration
echo "stunServerAddress=$KMS_STUN_IP" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
echo "stunServerPort=$KMS_STUN_PORT" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
if [ -n "$KMS_TURN_URL" ]; then
echo "turnURL=$KMS_TURN_URL" >> /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
fi
elif [ -n "$KMS_TURN_URL" ]; then
echo "turnURL=$KMS_TURN_URL" > /etc/kurento/modules/kurento/WebRtcEndpoint.conf.ini
fi
# Remove ipv6 local loop until ipv6 is supported