From 169df4373b2284b36c469b6707ec91a6c2d2e99b Mon Sep 17 00:00:00 2001 From: pabloFuente Date: Wed, 20 Sep 2023 17:59:50 +0200 Subject: [PATCH] openvidu-test-e2e: fix docker run command for mediasoup-controller --- ci-scripts/openvidu-e2e-tests.sh | 4 ++-- .../src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ci-scripts/openvidu-e2e-tests.sh b/ci-scripts/openvidu-e2e-tests.sh index 24379e4d..f4a25ff4 100755 --- a/ci-scripts/openvidu-e2e-tests.sh +++ b/ci-scripts/openvidu-e2e-tests.sh @@ -50,7 +50,7 @@ function environmentLaunch { done elif [[ "${MEDIA_SERVER}" == "mediasoup" ]]; then LOG_DATE=$(printf '%(%Y-%m-%d-%H:%M:%S)T') - docker run --network=host --restart=always --detach=true \ + docker run --network=host --restart=always \ --env=KMS_MIN_PORT=40000 \ --env=KMS_MAX_PORT=65535 \ --env=OPENVIDU_PRO_LICENSE="${OPENVIDU_PRO_LICENSE}" \ @@ -58,7 +58,7 @@ function environmentLaunch { --env=WEBRTC_LISTENIPS_0_ANNOUNCEDIP="${DOCKER_HOST_IP}" \ --env=WEBRTC_LISTENIPS_0_IP="${DOCKER_HOST_IP}" \ --volume=/opt/openvidu/recordings:/opt/openvidu/recordings \ - openvidu/mediasoup-controller:"${MEDIASOUP_CONTROLLER_VERSION} >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log" + openvidu/mediasoup-controller:"${MEDIASOUP_CONTROLLER_VERSION}" >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log & until $(curl --insecure --output /dev/null --silent http://${DOCKER_HOST_IP}:8888/kurento); do echo "Waiting for ${MEDIA_SERVER}..." sleep 1 diff --git a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java index 6c6422c9..3bd43a80 100644 --- a/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java +++ b/openvidu-test-e2e/src/main/java/io/openvidu/test/e2e/OpenViduTestE2e.java @@ -638,11 +638,11 @@ public class OpenViduTestE2e { + " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE; } else if (MEDIA_SERVER_IMAGE.startsWith(MEDIASOUP_IMAGE)) { log.info("Starting mediaSoup"); - command = "LOG_DATE=$(printf '%(%Y-%m-%d-%H:%M:%S)T'); docker run --network=host --restart=always --detach=true --env=KMS_MIN_PORT=40000 --env=KMS_MAX_PORT=65535" + command = "LOG_DATE=$(printf '%(%Y-%m-%d-%H:%M:%S)T'); docker run --network=host --restart=always --env=KMS_MIN_PORT=40000 --env=KMS_MAX_PORT=65535" + " --env=OPENVIDU_PRO_LICENSE=" + OPENVIDU_PRO_LICENSE + " --env=OPENVIDU_PRO_LICENSE_API=" + OPENVIDU_PRO_LICENSE_API + " --env=WEBRTC_LISTENIPS_0_ANNOUNCEDIP=172.17.0.1 --env=WEBRTC_LISTENIPS_0_IP=172.17.0.1" - + " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE + " >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log"; + + " --volume=/opt/openvidu/recordings:/opt/openvidu/recordings " + MEDIA_SERVER_IMAGE + " >& /opt/openvidu/mediasoup-controller-${LOG_DATE}.log &"; } else { log.error("Unrecognized MEDIA_SERVER_IMAGE: {}", MEDIA_SERVER_IMAGE); System.exit(1);