mirror of
https://github.com/nextcloud/all-in-one.git
synced 2024-09-21 15:26:16 +08:00
enable stun auto detection
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
parent
aeae72f5ba
commit
9d154557f8
|
@ -34,9 +34,11 @@ RUN set -ex; \
|
||||||
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
|
rename -v ".jcfg.sample" ".jcfg" /usr/local/etc/janus/*.jcfg.sample
|
||||||
|
|
||||||
FROM alpine:3.18.2
|
FROM alpine:3.18.2
|
||||||
|
ENV STUN_SERVICE="stun.nextcloud.com 443"
|
||||||
COPY --from=janus /usr/local /usr/local
|
COPY --from=janus /usr/local /usr/local
|
||||||
COPY --from=eturnal /opt/eturnal /opt/eturnal
|
COPY --from=eturnal /opt/eturnal /opt/eturnal
|
||||||
|
COPY --from=eturnal /usr/local/bin/stun /usr/local/bin/stun
|
||||||
|
COPY --from=eturnal /usr/local/bin/eturnalctl /usr/local/bin/eturnalctl
|
||||||
COPY --from=nats /nats-server /usr/local/bin/nats-server
|
COPY --from=nats /nats-server /usr/local/bin/nats-server
|
||||||
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
|
COPY --from=signaling /usr/bin/nextcloud-spreed-signaling /usr/local/bin/nextcloud-spreed-signaling
|
||||||
|
|
||||||
|
|
|
@ -19,14 +19,11 @@ elif [ -z "$INTERNAL_SECRET" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
set -x
|
||||||
IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk A +short | grep -E "^[0-9.]+$" | sort | head -n1)"
|
IPv4_ADDRESS_TALK="$(dig nextcloud-aio-talk IN A +short | grep '^[0-9.]\+$' | sort | head -n1)"
|
||||||
IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short | grep -E "^[0-9a-f:]+$" | sort | head -n1)"
|
IPv6_ADDRESS_TALK="$(dig nextcloud-aio-talk AAAA +short | grep '^[0-9a-f:]\+$' | sort | head -n1)"
|
||||||
|
|
||||||
IPv4_ADDRESS_NC="$(dig "$NC_DOMAIN" A +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep "^[0-9.]\+$" | sort | head -n1)"
|
IPv4_ADDRESS_NC="$(dig "$NC_DOMAIN" IN A +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep '^[0-9.]\+$' | sort | head -n1)"
|
||||||
IPv6_ADDRESS_NC="$(dig "$NC_DOMAIN" AAAA +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep "^[0-9a-f:]\+$" | sort | head -n1)"
|
IPv6_ADDRESS_NC="$(dig "$NC_DOMAIN" IN AAAA +short +https +tls-ca=/etc/ssl/certs/ca-certificates.crt @1.1.1.1 | grep '^[0-9a-f:]\+$' | sort | head -n1)"
|
||||||
#if [ -z "$IPv4_ADDRESS_NC" ] && [ -z "$IPv6_ADDRESS_NC" ]; then
|
|
||||||
# export STUN_SERVICE="stun.nextcloud.com 443"
|
|
||||||
#fi
|
|
||||||
set +x
|
set +x
|
||||||
|
|
||||||
# Turn
|
# Turn
|
||||||
|
|
Loading…
Reference in a new issue