Update ready-check service to use own image. Improve output of ready-check
This commit is contained in:
cruizba
parent
32844c1ef2
commit
277c15b2c0
@ -232,7 +232,7 @@ services:
|
||||
condition: service_completed_successfully
|
||||
|
||||
ready-check:
|
||||
image: docker.io/curlimages/curl:8.13.0
|
||||
image: docker.io/openvidu/ready-check:main
|
||||
platform: linux/amd64
|
||||
container_name: ready-check
|
||||
restart: on-failure
|
||||
@ -241,12 +241,15 @@ services:
|
||||
- LAN_DOMAIN=${LAN_DOMAIN:-}
|
||||
- LAN_MODE=${LAN_MODE:-false}
|
||||
- LAN_PRIVATE_IP=${LAN_PRIVATE_IP:-}
|
||||
- LIVEKIT_API_KEY=${LIVEKIT_API_KEY:-}
|
||||
- LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- DASHBOARD_ADMIN_USERNAME=${DASHBOARD_ADMIN_USERNAME:-}
|
||||
- DASHBOARD_ADMIN_PASSWORD=${DASHBOARD_ADMIN_PASSWORD:-}
|
||||
- MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY:-}
|
||||
- MINIO_SECRET_KEY=${MINIO_SECRET_KEY:-}
|
||||
- LIVEKIT_API_KEY=${LIVEKIT_API_KEY:-}
|
||||
- LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- MEET_ADMIN_USER=${MEET_ADMIN_USER:-}
|
||||
- MEET_ADMIN_SECRET=${MEET_ADMIN_SECRET:-}
|
||||
- MEET_API_KEY=${MEET_API_KEY:-}
|
||||
depends_on:
|
||||
- openvidu
|
||||
- ingress
|
||||
@ -254,10 +257,6 @@ services:
|
||||
- dashboard
|
||||
- minio
|
||||
- mongo
|
||||
volumes:
|
||||
- ./scripts/ready-check.sh:/scripts/ready-check.sh
|
||||
- ./scripts/utils.sh:/scripts/utils.sh
|
||||
command: /bin/sh /scripts/ready-check.sh
|
||||
|
||||
setup:
|
||||
image: docker.io/busybox:1.37.0
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /scripts/utils.sh
|
||||
|
||||
trap 'handle_sigint' SIGINT
|
||||
|
||||
handle_sigint() {
|
||||
echo "SIGINT signal received, exiting..."
|
||||
exit 1
|
||||
}
|
||||
|
||||
wait_for_service() {
|
||||
SERVICE_NAME=$1
|
||||
SERVICE_URL=$2
|
||||
shift 2
|
||||
EXTRA=$@
|
||||
if [ -n "$EXTRA" ]; then
|
||||
until curl $EXTRA $SERVICE_URL > /dev/null; do
|
||||
echo "Waiting for $SERVICE_NAME to start...";
|
||||
sleep 1;
|
||||
done;
|
||||
else
|
||||
until curl --silent --head --fail $SERVICE_URL > /dev/null; do
|
||||
echo "Waiting for $SERVICE_NAME to start...";
|
||||
sleep 1;
|
||||
done;
|
||||
fi;
|
||||
}
|
||||
|
||||
wait_for_service 'OpenVidu' 'http://openvidu:7880'
|
||||
wait_for_service 'Ingress' 'http://ingress:9091'
|
||||
wait_for_service 'Egress' 'http://egress:9091'
|
||||
wait_for_service 'Dashboard' 'http://dashboard:5000'
|
||||
wait_for_service 'Minio' 'http://minio:9000/minio/health/live'
|
||||
wait_for_service 'Minio Console' 'http://minio:9001/minio-console'
|
||||
wait_for_service 'Mongo' 'http://mongo:27017' --connect-timeout 10 --silent
|
||||
|
||||
LAN_HTTP_URL=$(getDeploymentUrl http)
|
||||
LAN_WS_URL=$(getDeploymentUrl ws)
|
||||
|
||||
for i in $(seq 1 10); do
|
||||
echo 'Starting OpenVidu... Please be patient...'
|
||||
sleep 1
|
||||
done;
|
||||
echo ''
|
||||
echo ''
|
||||
echo '========================================='
|
||||
echo '🎉 OpenVidu is ready! 🎉'
|
||||
echo '========================================='
|
||||
echo ''
|
||||
echo 'OpenVidu Server & LiveKit Server URLs:'
|
||||
echo ''
|
||||
echo ' - From this machine:'
|
||||
echo ''
|
||||
echo ' - http://localhost:7880'
|
||||
echo ' - ws://localhost:7880'
|
||||
echo ''
|
||||
echo ' - From other devices in your LAN:'
|
||||
echo ''
|
||||
echo " - $LAN_HTTP_URL"
|
||||
echo " - $LAN_WS_URL"
|
||||
echo ''
|
||||
echo '========================================='
|
||||
echo ''
|
||||
echo 'OpenVidu Developer UI (services and passwords):'
|
||||
echo ''
|
||||
echo ' - http://localhost:7880'
|
||||
echo " - $LAN_HTTP_URL"
|
||||
echo ''
|
||||
echo '========================================='
|
||||
@ -251,7 +251,7 @@ services:
|
||||
condition: service_completed_successfully
|
||||
|
||||
ready-check:
|
||||
image: docker.io/curlimages/curl:8.13.0
|
||||
image: docker.io/openvidu/ready-check:main
|
||||
platform: linux/amd64
|
||||
container_name: ready-check
|
||||
restart: on-failure
|
||||
@ -260,13 +260,16 @@ services:
|
||||
- LAN_DOMAIN=${LAN_DOMAIN:-}
|
||||
- LAN_MODE=${LAN_MODE:-false}
|
||||
- LAN_PRIVATE_IP=${LAN_PRIVATE_IP:-}
|
||||
- V2COMPAT_OPENVIDU_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- LIVEKIT_API_KEY=${LIVEKIT_API_KEY:-}
|
||||
- LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- DASHBOARD_ADMIN_USERNAME=${DASHBOARD_ADMIN_USERNAME:-}
|
||||
- DASHBOARD_ADMIN_PASSWORD=${DASHBOARD_ADMIN_PASSWORD:-}
|
||||
- MINIO_ACCESS_KEY=${MINIO_ACCESS_KEY:-}
|
||||
- MINIO_SECRET_KEY=${MINIO_SECRET_KEY:-}
|
||||
- LIVEKIT_API_KEY=${LIVEKIT_API_KEY:-}
|
||||
- LIVEKIT_API_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- V2COMPAT_OPENVIDU_SECRET=${LIVEKIT_API_SECRET:-}
|
||||
- MEET_ADMIN_USER=${MEET_ADMIN_USER:-}
|
||||
- MEET_ADMIN_SECRET=${MEET_ADMIN_SECRET:-}
|
||||
- MEET_API_KEY=${MEET_API_KEY:-}
|
||||
depends_on:
|
||||
- openvidu
|
||||
- ingress
|
||||
@ -274,10 +277,6 @@ services:
|
||||
- dashboard
|
||||
- minio
|
||||
- mongo
|
||||
volumes:
|
||||
- ./scripts/ready-check.sh:/scripts/ready-check.sh
|
||||
- ./scripts/utils.sh:/scripts/utils.sh
|
||||
command: /bin/sh /scripts/ready-check.sh
|
||||
|
||||
operator:
|
||||
image: docker.io/openvidu/openvidu-operator:main
|
||||
|
||||
@ -1,70 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
. /scripts/utils.sh
|
||||
|
||||
trap 'handle_sigint' SIGINT
|
||||
|
||||
handle_sigint() {
|
||||
echo "SIGINT signal received, exiting..."
|
||||
exit 1
|
||||
}
|
||||
|
||||
wait_for_service() {
|
||||
SERVICE_NAME=$1
|
||||
SERVICE_URL=$2
|
||||
shift 2
|
||||
EXTRA=$@
|
||||
if [ -n "$EXTRA" ]; then
|
||||
until curl $EXTRA $SERVICE_URL > /dev/null; do
|
||||
echo "Waiting for $SERVICE_NAME to start...";
|
||||
sleep 1;
|
||||
done;
|
||||
else
|
||||
until curl --silent --head --fail $SERVICE_URL > /dev/null; do
|
||||
echo "Waiting for $SERVICE_NAME to start...";
|
||||
sleep 1;
|
||||
done;
|
||||
fi;
|
||||
}
|
||||
|
||||
wait_for_service 'OpenVidu' 'http://openvidu:7880'
|
||||
wait_for_service 'Ingress' 'http://ingress:9091'
|
||||
wait_for_service 'Egress' 'http://egress:9091'
|
||||
wait_for_service 'Dashboard' 'http://dashboard:5000'
|
||||
wait_for_service 'Minio' 'http://minio:9000/minio/health/live'
|
||||
wait_for_service 'Minio Console' 'http://minio:9001/minio-console'
|
||||
wait_for_service 'Mongo' 'http://mongo:27017' --connect-timeout 10 --silent
|
||||
|
||||
LAN_HTTP_URL=$(getDeploymentUrl http)
|
||||
LAN_WS_URL=$(getDeploymentUrl ws)
|
||||
|
||||
for i in $(seq 1 10); do
|
||||
echo 'Starting OpenVidu... Please be patient...'
|
||||
sleep 1
|
||||
done;
|
||||
echo ''
|
||||
echo ''
|
||||
echo '========================================='
|
||||
echo '🎉 OpenVidu is ready! 🎉'
|
||||
echo '========================================='
|
||||
echo ''
|
||||
echo 'OpenVidu Server & LiveKit Server URLs:'
|
||||
echo ''
|
||||
echo ' - From this machine:'
|
||||
echo ''
|
||||
echo ' - http://localhost:7880'
|
||||
echo ' - ws://localhost:7880'
|
||||
echo ''
|
||||
echo ' - From other devices in your LAN:'
|
||||
echo ''
|
||||
echo " - $LAN_HTTP_URL"
|
||||
echo " - $LAN_WS_URL"
|
||||
echo ''
|
||||
echo '========================================='
|
||||
echo ''
|
||||
echo 'OpenVidu Developer UI (services and passwords):'
|
||||
echo ''
|
||||
echo ' - http://localhost:7880'
|
||||
echo " - $LAN_HTTP_URL"
|
||||
echo ''
|
||||
echo '========================================='
|
||||
Loading…
x
Reference in New Issue
Block a user