diff --git a/openvidu-server/src/main/resources/application-container.properties b/openvidu-server/src/main/resources/application-container.properties index f78c73c5..8b2c08fb 100644 --- a/openvidu-server/src/main/resources/application-container.properties +++ b/openvidu-server/src/main/resources/application-container.properties @@ -1 +1,3 @@ +DOMAIN_OR_PUBLIC_IP=localhost +OPENVIDU_SECRET=MY_SECRET HTTPS_PORT=4443 \ No newline at end of file diff --git a/openvidu-server/src/main/resources/application.properties b/openvidu-server/src/main/resources/application.properties index 51a7a76c..93e3f2f6 100644 --- a/openvidu-server/src/main/resources/application.properties +++ b/openvidu-server/src/main/resources/application.properties @@ -9,12 +9,12 @@ logging.level.root=info spring.main.allow-bean-definition-overriding=true DOTENV_PATH=. -DOMAIN_OR_PUBLIC_IP=localhost -HTTPS_PORT=443 -CERTIFICATE_TYPE=selfsigned -KMS_URIS=["ws://localhost:8888/kurento"] -OPENVIDU_SECRET=MY_SECRET +DOMAIN_OR_PUBLIC_IP= +OPENVIDU_SECRET= +CERTIFICATE_TYPE=selfsigned +HTTPS_PORT=443 +KMS_URIS=["ws://localhost:8888/kurento"] OPENVIDU_CDR=false OPENVIDU_CDR_PATH=/opt/openvidu/cdr diff --git a/openvidu-test-e2e/jenkins/Jenkinsfile b/openvidu-test-e2e/jenkins/Jenkinsfile index 008f9554..e850e34d 100644 --- a/openvidu-test-e2e/jenkins/Jenkinsfile +++ b/openvidu-test-e2e/jenkins/Jenkinsfile @@ -70,10 +70,10 @@ node('container') { sh(script: '''#!/bin/bash if [ "$DOCKER_RECORDING_VERSION" != "default" ]; then echo "Using custom openvidu-recording tag: $DOCKER_RECORDING_VERSION" - cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_RECORDING_VERSION=$DOCKER_RECORDING_VERSION -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & + cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_RECORDING_VERSION=$DOCKER_RECORDING_VERSION -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & else echo "Using default openvidu-recording tag" - cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & + cd openvidu/openvidu-server/target && java -jar -DDOMAIN_OR_PUBLIC_IP=172.17.0.1 -DOPENVIDU_SECRET=MY_SECRET -DHTTPS_PORT=4443 -DOPENVIDU_RECORDING=true -DOPENVIDU_WEBHOOK=true -DOPENVIDU_WEBHOOK_ENDPOINT=http://127.0.0.1:7777/webhook openvidu-server-*.jar &> openvidu-server.log & fi '''.stripIndent()) sh 'until $(curl --insecure --output /dev/null --silent --head --fail https://OPENVIDUAPP:MY_SECRET@localhost:4443/); do echo "Waiting for openvidu-server..."; sleep 2; done'