From 5fec44d44ebf9389c02fee2be83c2eaecfb08f8d Mon Sep 17 00:00:00 2001 From: cruizba Date: Fri, 26 Sep 2025 15:23:49 +0200 Subject: [PATCH] Revert "openvidu-deployment: update deployment URL logic for meet service in docker-compose" This reverts commit 6bc21cc27edaa039577a26c36c975ddce85c9799. --- .../local-meet/docker-compose.base.yaml | 47 +++++++------------ .../pro/local-meet/docker-compose.base.yaml | 47 +++++++------------ 2 files changed, 34 insertions(+), 60 deletions(-) diff --git a/openvidu-deployment/community/local-meet/docker-compose.base.yaml b/openvidu-deployment/community/local-meet/docker-compose.base.yaml index dbc268d4..34b77e36 100644 --- a/openvidu-deployment/community/local-meet/docker-compose.base.yaml +++ b/openvidu-deployment/community/local-meet/docker-compose.base.yaml @@ -57,35 +57,24 @@ services: export USE_HTTPS=false export LAN_MODE=false fi + echo "Using LAN_PRIVATE_IP: $${LAN_PRIVATE_IP:-none}" + echo "Using USE_HTTPS: $${USE_HTTPS}" + echo "Using LAN_MODE: $${LAN_MODE}" getDeploymentUrl() { - 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" - if [ "$${USE_HTTPS}" = 'true' ]; then - URL="$${schema}s://localhost:7443" - fi - 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" + schema="$${1:-http}" + URL="$$schema://localhost:7880" + if [ "$${USE_HTTPS}" = 'true' ]; then + URL="$${schema}s://localhost:7443" + 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 + URL="$${schema}s://$${LAN_DOMAIN}:7443" + fi + echo "$$URL" } READY_CHECK_ENTRYPOINT: | #!/bin/sh @@ -132,9 +121,7 @@ services: . /scripts/utils.sh URL=$(getDeploymentUrl ws) - MEET_BASE_URL=$(getDeploymentUrl http meet) export LIVEKIT_URL="$${URL}" - export MEET_BASE_URL="$${MEET_BASE_URL}" /usr/local/bin/entrypoint.sh OPENVIDU_CONFIG: | diff --git a/openvidu-deployment/pro/local-meet/docker-compose.base.yaml b/openvidu-deployment/pro/local-meet/docker-compose.base.yaml index 3c38bb3a..e119c704 100644 --- a/openvidu-deployment/pro/local-meet/docker-compose.base.yaml +++ b/openvidu-deployment/pro/local-meet/docker-compose.base.yaml @@ -59,35 +59,24 @@ services: export USE_HTTPS=false export LAN_MODE=false fi + echo "Using LAN_PRIVATE_IP: $${LAN_PRIVATE_IP:-none}" + echo "Using USE_HTTPS: $${USE_HTTPS}" + echo "Using LAN_MODE: $${LAN_MODE}" getDeploymentUrl() { - 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" - if [ "$${USE_HTTPS}" = 'true' ]; then - URL="$${schema}s://localhost:7443" - fi - 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" + schema="$${1:-http}" + URL="$$schema://localhost:7880" + if [ "$${USE_HTTPS}" = 'true' ]; then + URL="$${schema}s://localhost:7443" + 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 + URL="$${schema}s://$${LAN_DOMAIN}:7443" + fi + echo "$$URL" } READY_CHECK_ENTRYPOINT: | #!/bin/sh @@ -149,9 +138,7 @@ services: . /scripts/utils.sh URL=$(getDeploymentUrl ws) - MEET_BASE_URL=$(getDeploymentUrl http meet) export LIVEKIT_URL="$${URL}" - export MEET_BASE_URL="$${MEET_BASE_URL}" /usr/local/bin/entrypoint.sh OPENVIDU_CONFIG: |