ambiser
/
openvidu
mirror of https://github.com/OpenVidu/openvidu.git
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "openvidu-deployment: update deployment URL logic for meet service in docker-compose" 

This reverts commit 6bc21cc27e.
master
cruizba 2025-09-26 15:23:49 +02:00
parent db20af15e6
commit 5fec44d44e
2 changed files with 34 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
openvidu-deployment/community/local-meet/docker-compose.base.yaml
View File

@ -57,34 +57,23 @@ 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}"
service="$${2:-default}"
if [ "$$service" = "meet" ]; then
URL="$$schema://localhost:9080"
if [ "$${USE_HTTPS}" = 'true' ]; then
URL="$${schema}s://localhost:9443"
fi
else
URL="$$schema://localhost:7880" URL="$$schema://localhost:7880"
if [ "$${USE_HTTPS}" = 'true' ]; then if [ "$${USE_HTTPS}" = 'true' ]; then
URL="$${schema}s://localhost:7443" URL="$${schema}s://localhost:7443"
fi fi
fi
if [ "$${LAN_MODE}" = 'true' ]; then if [ "$${LAN_MODE}" = 'true' ]; then
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"} LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
# Replace dots with dashes # Replace dots with dashes
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev" LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
fi fi
if [ "$$service" = "meet" ]; then
URL="$${schema}s://$${LAN_DOMAIN}:9443"
else
URL="$${schema}s://$${LAN_DOMAIN}:7443" URL="$${schema}s://$${LAN_DOMAIN}:7443"
fi fi
fi
echo "$$URL" echo "$$URL"
} }
READY_CHECK_ENTRYPOINT: | READY_CHECK_ENTRYPOINT: |
@ -132,9 +121,7 @@ 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: |

19
openvidu-deployment/pro/local-meet/docker-compose.base.yaml
View File

@ -59,34 +59,23 @@ 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}"
service="$${2:-default}"
if [ "$$service" = "meet" ]; then
URL="$$schema://localhost:9080"
if [ "$${USE_HTTPS}" = 'true' ]; then
URL="$${schema}s://localhost:9443"
fi
else
URL="$$schema://localhost:7880" URL="$$schema://localhost:7880"
if [ "$${USE_HTTPS}" = 'true' ]; then if [ "$${USE_HTTPS}" = 'true' ]; then
URL="$${schema}s://localhost:7443" URL="$${schema}s://localhost:7443"
fi fi
fi
if [ "$${LAN_MODE}" = 'true' ]; then if [ "$${LAN_MODE}" = 'true' ]; then
LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"} LAN_DOMAIN=$${LAN_DOMAIN:-"openvidu-local.dev"}
if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then if [ "$$LAN_PRIVATE_IP" != 'none' ] && [ "$${LAN_DOMAIN}" = 'openvidu-local.dev' ]; then
# Replace dots with dashes # Replace dots with dashes
LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev" LAN_DOMAIN="$$(echo "$$LAN_PRIVATE_IP" | sed 's/\./-/g').openvidu-local.dev"
fi fi
if [ "$$service" = "meet" ]; then
URL="$${schema}s://$${LAN_DOMAIN}:9443"
else
URL="$${schema}s://$${LAN_DOMAIN}:7443" URL="$${schema}s://$${LAN_DOMAIN}:7443"
fi fi
fi
echo "$$URL" echo "$$URL"
} }
READY_CHECK_ENTRYPOINT: | READY_CHECK_ENTRYPOINT: |
@ -149,9 +138,7 @@ 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: |