mirror of https://github.com/OpenVidu/openvidu.git
openvidu-deployment: update deployment URL logic for meet service in docker-compose
parent
9755cd6753
commit
6bc21cc27e
|
@ -57,24 +57,35 @@ services:
|
||||||
export USE_HTTPS=false
|
export USE_HTTPS=false
|
||||||
export LAN_MODE=false
|
export LAN_MODE=false
|
||||||
fi
|
fi
|
||||||
echo "Using LAN_PRIVATE_IP: $${LAN_PRIVATE_IP:-none}"
|
|
||||||
echo "Using USE_HTTPS: $${USE_HTTPS}"
|
|
||||||
echo "Using LAN_MODE: $${LAN_MODE}"
|
|
||||||
getDeploymentUrl() {
|
getDeploymentUrl() {
|
||||||
schema="$${1:-http}"
|
schema="$${1:-http}"
|
||||||
URL="$$schema://localhost:7880"
|
service="$${2:-default}"
|
||||||
if [ "$${USE_HTTPS}" = 'true' ]; then
|
|
||||||
URL="$${schema}s://localhost:7443"
|
if [ "$$service" = "meet" ]; then
|
||||||
fi
|
URL="$$schema://localhost:9080"
|
||||||
if [ "$${LAN_MODE}" = 'true' ]; then
|
if [ "$${USE_HTTPS}" = 'true' ]; then
|
||||||
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
|
URL="$${schema}s://localhost:9443"
|
||||||
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
|
fi
|
||||||
# Replace dots with dashes
|
else
|
||||||
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
|
URL="$$schema://localhost:7880"
|
||||||
fi
|
if [ "$${USE_HTTPS}" = 'true' ]; then
|
||||||
URL="$${schema}s://$${LAN_DOMAIN}:7443"
|
URL="$${schema}s://localhost:7443"
|
||||||
fi
|
fi
|
||||||
echo "$$URL"
|
fi
|
||||||
|
|
||||||
|
if [ "$${LAN_MODE}" = 'true' ]; then
|
||||||
|
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
|
||||||
|
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
|
||||||
|
# Replace dots with dashes
|
||||||
|
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
|
||||||
|
fi
|
||||||
|
if [ "$$service" = "meet" ]; then
|
||||||
|
URL="$${schema}s://$${LAN_DOMAIN}:9443"
|
||||||
|
else
|
||||||
|
URL="$${schema}s://$${LAN_DOMAIN}:7443"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "$$URL"
|
||||||
}
|
}
|
||||||
READY_CHECK_ENTRYPOINT: |
|
READY_CHECK_ENTRYPOINT: |
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
@ -121,7 +132,9 @@ services:
|
||||||
. /scripts/utils.sh
|
. /scripts/utils.sh
|
||||||
|
|
||||||
URL=$(getDeploymentUrl ws)
|
URL=$(getDeploymentUrl ws)
|
||||||
|
MEET_BASE_URL=$(getDeploymentUrl http meet)
|
||||||
export LIVEKIT_URL="$${URL}"
|
export LIVEKIT_URL="$${URL}"
|
||||||
|
export MEET_BASE_URL="$${MEET_BASE_URL}"
|
||||||
|
|
||||||
/usr/local/bin/entrypoint.sh
|
/usr/local/bin/entrypoint.sh
|
||||||
OPENVIDU_CONFIG: |
|
OPENVIDU_CONFIG: |
|
||||||
|
|
|
@ -59,26 +59,37 @@ services:
|
||||||
export USE_HTTPS=false
|
export USE_HTTPS=false
|
||||||
export LAN_MODE=false
|
export LAN_MODE=false
|
||||||
fi
|
fi
|
||||||
echo "Using LAN_PRIVATE_IP: $${LAN_PRIVATE_IP:-none}"
|
|
||||||
echo "Using USE_HTTPS: $${USE_HTTPS}"
|
|
||||||
echo "Using LAN_MODE: $${LAN_MODE}"
|
|
||||||
getDeploymentUrl() {
|
getDeploymentUrl() {
|
||||||
schema="$${1:-http}"
|
schema="$${1:-http}"
|
||||||
URL="$$schema://localhost:7880"
|
service="$${2:-default}"
|
||||||
if [ "$${USE_HTTPS}" = 'true' ]; then
|
|
||||||
URL="$${schema}s://localhost:7443"
|
if [ "$$service" = "meet" ]; then
|
||||||
fi
|
URL="$$schema://localhost:9080"
|
||||||
if [ "$${LAN_MODE}" = 'true' ]; then
|
if [ "$${USE_HTTPS}" = 'true' ]; then
|
||||||
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
|
URL="$${schema}s://localhost:9443"
|
||||||
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
|
fi
|
||||||
# Replace dots with dashes
|
else
|
||||||
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
|
URL="$$schema://localhost:7880"
|
||||||
fi
|
if [ "$${USE_HTTPS}" = 'true' ]; then
|
||||||
URL="$${schema}s://$${LAN_DOMAIN}:7443"
|
URL="$${schema}s://localhost:7443"
|
||||||
fi
|
fi
|
||||||
echo "$$URL"
|
fi
|
||||||
|
|
||||||
|
if [ "$${LAN_MODE}" = 'true' ]; then
|
||||||
|
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
|
||||||
|
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
|
||||||
|
# Replace dots with dashes
|
||||||
|
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
|
||||||
|
fi
|
||||||
|
if [ "$$service" = "meet" ]; then
|
||||||
|
URL="$${schema}s://$${LAN_DOMAIN}:9443"
|
||||||
|
else
|
||||||
|
URL="$${schema}s://$${LAN_DOMAIN}:7443"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
echo "$$URL"
|
||||||
}
|
}
|
||||||
READY_CHECK_ENTRYPOINT: |
|
READY_CHECK_ENTRYPOINT: |
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
set -e
|
set -e
|
||||||
export LAN_DOMAIN=openvidu-local.dev
|
export LAN_DOMAIN=openvidu-local.dev
|
||||||
|
@ -138,7 +149,9 @@ services:
|
||||||
. /scripts/utils.sh
|
. /scripts/utils.sh
|
||||||
|
|
||||||
URL=$(getDeploymentUrl ws)
|
URL=$(getDeploymentUrl ws)
|
||||||
|
MEET_BASE_URL=$(getDeploymentUrl http meet)
|
||||||
export LIVEKIT_URL="$${URL}"
|
export LIVEKIT_URL="$${URL}"
|
||||||
|
export MEET_BASE_URL="$${MEET_BASE_URL}"
|
||||||
|
|
||||||
/usr/local/bin/entrypoint.sh
|
/usr/local/bin/entrypoint.sh
|
||||||
OPENVIDU_CONFIG: |
|
OPENVIDU_CONFIG: |
|
||||||
|
|
Loading…
Reference in New Issue