nhyatt/build-containers
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

adds more methods to get public ip address in case one method is not available.

Browse Source
This commit is contained in:
Hyatt 2022-03-28 11:57:26 -05:00
parent be2a172473
commit f695c43311
Signed by: nhyatt
GPG Key ID: C50D0BBB5BC40BEA
1 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
build-deluge.jenkins
View File

@ -13,31 +13,68 @@ printf "%s\n" "Route Updated"
""" """
def connectivity_test = """#! /usr/bin/env sh def connectivity_test = """#! /usr/bin/env sh
getPublicIP() {
ip=""
# curl lookups
for i in "https://icanhazip.com" "https://ifconfig.me" "https://api.ipify.org" "https://bot.whatismyipaddress.com" "https://ipinfo.io/ip" "https://ipecho.net/plain"; do
ip=\$(curl -s "${i}")
if [ "\${ip}" != "" ]; then
printf '%s' "\${ip}"
return 0
fi
done
# DNS Lookups
ip=\$(dig -4 @ns1.google.com TXT o-o.myaddr.l.google.com +short | sed -e 's/"//g')
if [ "\${ip}" != "" ]; then
printf '%s' "\${ip}"
return 0
fi
ip=\$(dig -4 @resolver1.opendns.com A myip.opendns.com +short | sed -e 's/"//g')
if [ "\${ip}" != "" ]; then
printf '%s' "\${ip}"
return 0
fi
ip=\$(dig -4 @1.0.0.1 txt ch whoami.cloudflare +short | sed -e 's/"//g')
if [ "\${ip}" != "" ]; then
printf '%s' "\${ip}"
return 0
fi
}
if ! curl --silent --fail --insecure http://localhost:8112 > /dev/null; then if ! curl --silent --fail --insecure http://localhost:8112 > /dev/null; then
printf '%s\\n' "Deluge not running." printf '%s\\n' "Deluge not running."
exit 100 exit 100
fi fi
if [ -z "\${DDNS_HOST}" ] || [ "\${DDNS_HOST}" = "" ]; then if [ -z "\${DDNS_HOST}" ] || [ "\${DDNS_HOST}" = "" ]; then
printf '%s\\n' "Dynamic DNS host is not set." printf '%s\\n' "Dynamic DNS host is not set."
exit 100 exit 100
fi fi
DIP=\$(dig -4 @ns1.google.com TXT o-o.myaddr.l.google.com +short | sed -e 's/"//g')
DIP=\$(getPublicIP)
if [ -z "\${DIP+x}" ] || [ "\${DIP}" = "" ]; then if [ -z "\${DIP+x}" ] || [ "\${DIP}" = "" ]; then
printf '%s\\n' "Unable to detect real-world IP." printf '%s\\n' "Unable to detect real-world IP."
exit 100 exit 100
fi fi
KIP=\$(dig "\${DDNS_HOST}" +short) KIP=\$(dig "\${DDNS_HOST}" +short)
if [ -z "\${KIP+x}" ] || [ "\${KIP}" = "" ]; then if [ -z "\${KIP+x}" ] || [ "\${KIP}" = "" ]; then
printf '%s\\n' "Unable to get known IP." printf '%s\\n' "Unable to get known IP."
exit 100 exit 100
fi fi
if [ "\${DIP}" = "\${KIP}" ]; then if [ "\${DIP}" = "\${KIP}" ]; then
printf '%s\\n' "VPN is not functional." printf '%s\\n' "VPN is not functional."
exit 100 exit 100
fi fi
if ! ping -c 2 google.com > /dev/null; then if ! ping -c 2 google.com > /dev/null; then
printf '%s\\n' "No internet connectivity." printf '%s\\n' "No internet connectivity."
exit 100 exit 100
fi fi
""" """
@ -46,7 +83,7 @@ LABEL maintainer="The_Spider <spider@smoothnet.org>"
COPY route-override.sh connectivity_test.sh /root/ COPY route-override.sh connectivity_test.sh /root/
RUN apk add --no-cache openvpn iputils bind-tools && \\ RUN apk add --no-cache openvpn iputils bind-tools curl && \\
chmod +x /root/route-override.sh /root/connectivity_test.sh chmod +x /root/route-override.sh /root/connectivity_test.sh
""" """