diff --git a/docker-compose.openvidu.yml b/docker-compose.openvidu.yml index 0d15fbf6..d2842b95 100644 --- a/docker-compose.openvidu.yml +++ b/docker-compose.openvidu.yml @@ -1,22 +1,27 @@ version: '3' services: kurento-media-server2: build: context: ./docker/kurento-media-server/ container_name: kolab-kurento-media-server2 environment: - GST_DEBUG=3,Kurento*:4,kms*:4,sdp*:4,webrtc*:4,*rtpendpoint:4,rtp*handler:4,rtpsynchronizer:4,agnosticbin:4 - KMS_PORT=8889 hostname: kurento-media-server.hosted.com image: apheleia/kurento-media-server:6.15.0 network_mode: host openvidu: build: context: ./docker/openvidu-dev/ + privileged: true + container_name: kolab-openvidu depends_on: - kurento-media-server - kurento-media-server2 + environment: + - KMS_URIS=["ws://localhost:8888/kurento"] + #- KMS_URIS=["ws://localhost:8888/kurento", "ws://localhost:8889/kurento"] volumes: - /etc/letsencrypt/:/etc/letsencrypt/:ro - - ~/src/openvidu:/src/openvidu/ + - ~/src/openvidu:/src/openvidu/:ro - ./docker/openvidu-dev/build/.m2:/root/.m2/ diff --git a/docker/openvidu-dev/Dockerfile b/docker/openvidu-dev/Dockerfile index ecc0bfd5..82c421c2 100644 --- a/docker/openvidu-dev/Dockerfile +++ b/docker/openvidu-dev/Dockerfile @@ -1,44 +1,44 @@ -FROM fedora:31 +FROM fedora:34 MAINTAINER Jeroen van Meeuwen ENV CERTIFICATE_TYPE=selfsigned ENV DOMAIN_OR_PUBLIC_IP=localhost.localdomain ENV OPENVIDU_SECRET=MY_SECRET RUN dnf -y install \ --setopt 'tsflags=nodocs' \ bash-completion \ bind-utils \ coturn \ curl \ dhcp-client \ git \ iproute \ iptraf-ng \ iputils \ java-1.8.0-openjdk \ less \ lsof \ maven \ mtr \ net-tools \ NetworkManager \ NetworkManager-tui \ network-scripts \ nmap-ncat \ openssh-clients \ openssh-server \ procps-ng \ redis \ strace \ systemd-udev \ tcpdump \ telnet \ traceroute \ vim-enhanced \ wget && \ dnf clean all COPY init.sh /init.sh CMD [ "/init.sh" ] diff --git a/docker/openvidu-dev/init.sh b/docker/openvidu-dev/init.sh index 30f277ea..9a5640c6 100755 --- a/docker/openvidu-dev/init.sh +++ b/docker/openvidu-dev/init.sh @@ -1,4 +1,6 @@ #!/bin/bash -cd /src/openvidu/ +set -e +cp -R /src/openvidu /src/openvidusrc +cd /src/openvidusrc mvn -DskipTests=true clean install -/usr/bin/java -jar /src/openvidu/openvidu-server/target/openvidu-server-2.16.0.jar +/usr/bin/java -jar /src/openvidusrc/openvidu-server/target/openvidu-server-2.18.0.jar