From 50926d25328c6b5405847fad1dedc44460992e92 Mon Sep 17 00:00:00 2001 From: cruizba Date: Mon, 24 Jun 2024 12:31:03 +0200 Subject: [PATCH] Check that LAN_PRIVATE_IP is reachable --- community/docker-compose.yaml | 8 ++++---- community/scripts/setup.sh | 14 ++++++++++++++ pro/docker-compose.yaml | 10 +++++----- pro/scripts/setup.sh | 14 ++++++++++++++ 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/community/docker-compose.yaml b/community/docker-compose.yaml index 70102a9..f2100b1 100644 --- a/community/docker-compose.yaml +++ b/community/docker-compose.yaml @@ -1,6 +1,6 @@ services: caddy-proxy: - image: docker.io/openvidu/openvidu-caddy-local:3.0.0-dev4 + image: docker.io/openvidu/openvidu-caddy-local:main container_name: caddy-proxy restart: unless-stopped extra_hosts: @@ -79,7 +79,7 @@ services: condition: service_completed_successfully dashboard: - image: docker.io/openvidu/openvidu-dashboard:3.0.0-dev4 + image: docker.io/openvidu/openvidu-dashboard:main container_name: dashboard restart: unless-stopped environment: @@ -92,7 +92,7 @@ services: condition: service_completed_successfully openvidu: - image: docker.io/openvidu/openvidu-server:3.0.0-dev4 + image: docker.io/openvidu/openvidu-server:main restart: unless-stopped container_name: openvidu extra_hosts: @@ -144,7 +144,7 @@ services: condition: service_completed_successfully default-app: - image: docker.io/openvidu/openvidu-call:3.0.0-dev4-demo + image: docker.io/openvidu/openvidu-call:main-demo container_name: openvidu-call restart: on-failure environment: diff --git a/community/scripts/setup.sh b/community/scripts/setup.sh index ed9a439..2704a16 100644 --- a/community/scripts/setup.sh +++ b/community/scripts/setup.sh @@ -14,6 +14,20 @@ if [ -z "$LAN_PRIVATE_IP" ]; then echo 'If it can'\''t be found, you can manually set it in the .env file' echo '------------------------' exit 1 +else + # Check if the LAN_PRIVATE_IP is reachable + if ! ping -c 1 -W 1 "$LAN_PRIVATE_IP" > /dev/null; then + echo "ERROR: LAN_PRIVATE_IP $LAN_PRIVATE_IP is not reachable" + echo " Maybe you changed your network or the IP is wrong" + echo " Please update the LAN_PRIVATE_IP in the .env file or" + echo " run the configure_lan_private_ip script again:" + echo "" + echo " - Linux: ./configure_lan_private_ip_linux.sh" + echo " - MacOS: ./configure_lan_private_ip_macos.sh" + echo " - Windows: .\configure_lan_private_ip_windows.bat" + echo "" + exit 1 + fi fi if [ "$LAN_MODE" = 'true' ] && [ "$USE_HTTPS" = 'false' ]; then diff --git a/pro/docker-compose.yaml b/pro/docker-compose.yaml index a16876f..57ffedb 100644 --- a/pro/docker-compose.yaml +++ b/pro/docker-compose.yaml @@ -1,6 +1,6 @@ services: caddy-proxy: - image: docker.io/openvidu/openvidu-caddy-local:3.0.0-dev4 + image: docker.io/openvidu/openvidu-caddy-local:main container_name: caddy-proxy restart: unless-stopped extra_hosts: @@ -79,7 +79,7 @@ services: condition: service_completed_successfully dashboard: - image: docker.io/openvidu/openvidu-dashboard:3.0.0-dev4 + image: docker.io/openvidu/openvidu-dashboard:main container_name: dashboard restart: unless-stopped environment: @@ -92,7 +92,7 @@ services: condition: service_completed_successfully openvidu: - image: docker.io/openvidu/openvidu-server-pro:3.0.0-dev4 + image: docker.io/openvidu/openvidu-server-pro:main restart: unless-stopped container_name: openvidu extra_hosts: @@ -146,7 +146,7 @@ services: condition: service_completed_successfully default-app: - image: docker.io/openvidu/openvidu-call:3.0.0-dev4-demo + image: docker.io/openvidu/openvidu-call:main-demo container_name: openvidu-call restart: on-failure environment: @@ -172,7 +172,7 @@ services: condition: service_completed_successfully openvidu-v2compatibility: - image: docker.io/openvidu/openvidu-v2compatibility:3.0.0-dev4 + image: docker.io/openvidu/openvidu-v2compatibility:main restart: unless-stopped container_name: openvidu-v2compatibility entrypoint: /bin/sh /scripts/entrypoint.sh diff --git a/pro/scripts/setup.sh b/pro/scripts/setup.sh index ed9a439..2704a16 100644 --- a/pro/scripts/setup.sh +++ b/pro/scripts/setup.sh @@ -14,6 +14,20 @@ if [ -z "$LAN_PRIVATE_IP" ]; then echo 'If it can'\''t be found, you can manually set it in the .env file' echo '------------------------' exit 1 +else + # Check if the LAN_PRIVATE_IP is reachable + if ! ping -c 1 -W 1 "$LAN_PRIVATE_IP" > /dev/null; then + echo "ERROR: LAN_PRIVATE_IP $LAN_PRIVATE_IP is not reachable" + echo " Maybe you changed your network or the IP is wrong" + echo " Please update the LAN_PRIVATE_IP in the .env file or" + echo " run the configure_lan_private_ip script again:" + echo "" + echo " - Linux: ./configure_lan_private_ip_linux.sh" + echo " - MacOS: ./configure_lan_private_ip_macos.sh" + echo " - Windows: .\configure_lan_private_ip_windows.bat" + echo "" + exit 1 + fi fi if [ "$LAN_MODE" = 'true' ] && [ "$USE_HTTPS" = 'false' ]; then