diff --git a/Dockerfile b/Dockerfile index f89e20d..06d2f95 100644 --- a/Dockerfile +++ b/Dockerfile @@ -578,7 +578,7 @@ turnserver \ --listening-ip=\"::\" \ --listening-port=\"\${SELKIES_TURN_PORT:-3478}\" \ --realm=\"\${TURN_REALM:-example.com}\" \ - --external-ip=\"\${SELKIES_TURN_HOST:-\$(curl -fsSL checkip.amazonaws.com)}\" \ + --external-ip=\"\${SELKIES_TURN_HOST:-\$(curl -fsSL checkip.amazonaws.com 2>/dev/null || hostname -I 2>/dev/null | awk '{print \$1}' || echo '127.0.0.1')}\" \ --min-port=\"\${TURN_MIN_PORT:-49152}\" \ --max-port=\"\${TURN_MAX_PORT:-65535}\" \ --channel-lifetime=\"\${TURN_CHANNEL_LIFETIME:--1}\" \ diff --git a/kasmvnc-entrypoint.sh b/kasmvnc-entrypoint.sh index 5a6f6de..e327fac 100644 --- a/kasmvnc-entrypoint.sh +++ b/kasmvnc-entrypoint.sh @@ -30,7 +30,8 @@ yq -i " .encoding.max_frame_rate = ${DISPLAY_REFRESH} | .network.interface = \"127.0.0.1\" | .network.websocket_port = 8081 | -.network.ssl.require_ssl = $(echo ${SELKIES_ENABLE_HTTPS-false} | tr '[:upper:]' '[:lower:]') +.network.ssl.require_ssl = $(echo ${SELKIES_ENABLE_HTTPS-false} | tr '[:upper:]' '[:lower:]') | +.network.udp.public_ip = \"$(curl -fsSL checkip.amazonaws.com 2>/dev/null || hostname -I 2>/dev/null | awk '{print $1}' || echo '127.0.0.1')\" " /etc/kasmvnc/kasmvnc.yaml if [ -n "${SELKIES_HTTPS_CERT}" ]; then yq -i ".network.ssl.pem_certificate = \"${SELKIES_HTTPS_CERT-/etc/ssl/certs/ssl-cert-snakeoil.pem}\"" /etc/kasmvnc/kasmvnc.yaml; fi diff --git a/selkies-gstreamer-entrypoint.sh b/selkies-gstreamer-entrypoint.sh index 14128f4..d18bfff 100755 --- a/selkies-gstreamer-entrypoint.sh +++ b/selkies-gstreamer-entrypoint.sh @@ -34,7 +34,7 @@ export SELKIES_ENCODER="${SELKIES_ENCODER:-x264enc}" export SELKIES_ENABLE_RESIZE="${SELKIES_ENABLE_RESIZE:-false}" if ( [ -z "${SELKIES_TURN_USERNAME}" ] || [ -z "${SELKIES_TURN_PASSWORD}" ] ) && [ -z "${SELKIES_TURN_SHARED_SECRET}" ] || [ -z "${SELKIES_TURN_HOST}" ] || [ -z "${SELKIES_TURN_PORT}" ]; then export TURN_RANDOM_PASSWORD="$(tr -dc 'A-Za-z0-9' < /dev/urandom 2>/dev/null | head -c 24)" - export SELKIES_TURN_HOST="${SELKIES_TURN_HOST:-$(curl -fsSL checkip.amazonaws.com)}" + export SELKIES_TURN_HOST="${SELKIES_TURN_HOST:-$(curl -fsSL checkip.amazonaws.com 2>/dev/null || hostname -I 2>/dev/null | awk '{print $1}' || echo '127.0.0.1')}" export SELKIES_TURN_PORT="3478" export SELKIES_TURN_USERNAME="selkies" export SELKIES_TURN_PASSWORD="${TURN_RANDOM_PASSWORD}"