mykitserver/docker-ddns-ipv64
1
0
Fork 0
mirror of https://github.com/mykitserver/docker-ddns-ipv64.git synced 2025-12-08 09:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: mykitserver:v0.0.4
Branches Tags
mykitserver:master mykitserver:development
mykitserver:v0.1.4 mykitserver:v0.1.3 mykitserver:v0.1.2 mykitserver:v0.1.1 mykitserver:v0.1.0 mykitserver:v0.0.9 mykitserver:v0.0.8 mykitserver:v0.0.7 mykitserver:v0.0.6 mykitserver:v0.0.5 mykitserver:v0.0.4 mykitserver:v0.0.3 mykitserver:v0.0.2 mykitserver:v0.0.1
..
compare: mykitserver:v0.0.6
Branches Tags
mykitserver:master mykitserver:development
mykitserver:v0.1.4 mykitserver:v0.1.3 mykitserver:v0.1.2 mykitserver:v0.1.1 mykitserver:v0.1.0 mykitserver:v0.0.9 mykitserver:v0.0.8 mykitserver:v0.0.7 mykitserver:v0.0.6 mykitserver:v0.0.5 mykitserver:v0.0.4 mykitserver:v0.0.3 mykitserver:v0.0.2 mykitserver:v0.0.1

8 Commits
v0.0.4 ... v0.0.6

Author SHA1 Message Date
alcapone1933
a7c1e4c82d Merge pull request 'v.0.0.6 User-agent' (#1) from development into master 
v.0.0.6 User-agent
 2022-11-12 11:24:56 +01:00
alcapone1933
a7045709c8 v.0.0.6 User-agent 2022-11-12 11:13:46 +01:00
alcapone1933
c7a5b39b2d v0.0.5 fix 2022-11-08 02:09:48 +01:00
alcapone1933
968c247858 fix 2022-11-07 18:22:13 +01:00
alcapone1933
4688c5c445 „data/entrypoint.sh“ ändern 2022-11-07 18:17:19 +01:00
alcapone1933
2b0b61581a fix 2022-11-07 18:14:41 +01:00
alcapone1933
98bd887fd0 update v0.0.4 2022-11-04 08:20:59 +01:00
alcapone1933
1456cea9f8 v0.0.4 2022-11-04 02:08:07 +01:00
7 changed files with 34 additions and 27 deletions
Expand all files Collapse all files

4
.drone.yml
View File

@@ -37,7 +37,7 @@ steps:
repo: alcapone1933/ddns-ipv64 repo: alcapone1933/ddns-ipv64
# tags: latest # tags: latest
auto_tag: true auto_tag: true
auto_tag_suffix: v0.0.4 auto_tag_suffix: v0.0.6
trigger: trigger:
branch: branch:
@@ -68,7 +68,7 @@ steps:
repo: ghcr.io/alcapone1933/ddns-ipv64 repo: ghcr.io/alcapone1933/ddns-ipv64
# tags: latest # tags: latest
auto_tag: true auto_tag: true
auto_tag_suffix: v0.0.4 auto_tag_suffix: v0.0.6
trigger: trigger:
branch: branch:

7
Dockerfile
View File

@@ -4,7 +4,7 @@ LABEL maintainer="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
org.opencontainers.image.created="$(date +%Y-%m-%d\ %H:%M)" \ org.opencontainers.image.created="$(date +%Y-%m-%d\ %H:%M)" \
org.opencontainers.image.authors="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \ org.opencontainers.image.authors="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
org.opencontainers.image.url="https://hub.docker.com/r/alcapone1933/ddns-ipv64" \ org.opencontainers.image.url="https://hub.docker.com/r/alcapone1933/ddns-ipv64" \
org.opencontainers.image.version="v0.0.4" \ org.opencontainers.image.version="v0.0.6" \
org.opencontainers.image.ref.name="alcapone1933/ddns-ipv64" \ org.opencontainers.image.ref.name="alcapone1933/ddns-ipv64" \
org.opencontainers.image.title="DDNS Updater ipv64.net" \ org.opencontainers.image.title="DDNS Updater ipv64.net" \
org.opencontainers.image.description="Community DDNS Updater fuer ipv64.net" org.opencontainers.image.description="Community DDNS Updater fuer ipv64.net"
@@ -12,9 +12,12 @@ LABEL maintainer="alcapone1933 <alcapone1933@cosanostra-cloud.de>" \
ENV TZ=Europe/Berlin ENV TZ=Europe/Berlin
ENV CRON_TIME="*/15 * * * *" ENV CRON_TIME="*/15 * * * *"
ENV CRON_TIME_DIG="*/30 * * * *" ENV CRON_TIME_DIG="*/30 * * * *"
ENV VERSION="v0.0.6"
ENV CURL_USER_AGENT="docker-ddns-ipv64/version=$VERSION github.com/alcapone1933/docker-ddns-ipv64"
RUN apk add --update --no-cache tzdata curl bash tini bind-tools jq && \ RUN apk add --update --no-cache tzdata curl bash tini bind-tools jq && \
rm -rf /var/cache/apk/* rm -rf /var/cache/apk/*
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
RUN mkdir -p /data /usr/local/bin/ /etc/cron.d/ RUN mkdir -p /data /usr/local/bin/ /etc/cron.d/
COPY data /data COPY data /data
RUN mv /data/entrypoint.sh /usr/local/bin/entrypoint.sh && mv /data/cronjob /etc/cron.d/container_cronjob && mv /data/healthcheck.sh /usr/local/bin/healthcheck.sh && \ RUN mv /data/entrypoint.sh /usr/local/bin/entrypoint.sh && mv /data/cronjob /etc/cron.d/container_cronjob && mv /data/healthcheck.sh /usr/local/bin/healthcheck.sh && \
@@ -23,5 +26,5 @@ RUN mv /data/entrypoint.sh /usr/local/bin/entrypoint.sh && mv /data/cronjob /etc
# VOLUME [ "/data" ] # VOLUME [ "/data" ]
ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"] ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"]
HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=3 CMD curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1 HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=3 CMD curl -sSL --user-agent "${CURL_USER_AGENT}" --fail "https://ipv64.net" > /dev/null || exit 1
# HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=2 CMD /usr/local/bin/healthcheck.sh # HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=2 CMD /usr/local/bin/healthcheck.sh

3
data/cronjob
View File

@@ -1,3 +1,4 @@
# Cronjob DDNS Updater ipv64.net # Cronjob DDNS Updater ipv64.net
*/15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1 */15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1
*/30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` IP CHECK - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1 # */30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` IP CHECK - Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1
*/30 * * * * sleep 20 && for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "`date +%Y-%m-%d\ %H:%M:%S` IP CHECK - Deine DOMAIN ${DOMAIN} HAT DIE IP=`dig +short ${DOMAIN} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1; done

34
data/ddns-update.sh
View File

@@ -1,29 +1,30 @@
#!/usr/bin/env bash #!/usr/bin/env bash
DATUM=$(date +%Y-%m-%d\ %H:%M:%S) DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
if ! curl -sSL --fail https://ipv64.net/ > /dev/null; then if ! curl -sSL --user-agent "${CURL_USER_AGENT}" --fail "https://ipv64.net" > /dev/null; then
echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang" echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang"
exit 0 exit 0
fi fi
PFAD="/data" PFAD="/data"
# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1) # IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
IP=$(curl -4ssL https://ipv64.net/update.php?howismyip | jq -r 'to_entries[] | "\(.value)"') IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
UPDIP=$(cat $PFAD/updip.txt) UPDIP=$(cat $PFAD/updip.txt)
sleep 1 sleep 1
if [ "$IP" == "$UPDIP" ]; then if [ "$IP" == "$UPDIP" ]; then
echo "$DATUM KEIN UPDATE - Aktuelle IP= $UPDIP" echo "$DATUM KEIN UPDATE - Aktuelle IP=$UPDIP"
else else
echo "$DATUM UPDATE !!! ..." echo "$DATUM UPDATE !!! ..."
echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP= $UPDIP" echo "$DATUM UPDATE !!! - Update IP=$IP - Alte-IP=$UPDIP"
sleep 1 sleep 1
echo "$IP" > $PFAD/updip.txt echo "$IP" > $PFAD/updip.txt
# curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min" # curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min"
UPDATE_IP=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min") UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
if [ "$UPDATE_IP" = "ok" ] ; then # if [ "$UPDATE_IP" = "ok" ] ; then
echo "$DATUM UPDATE !!! - UPDATE IP= $IP AN IPV64.NET GESENDET" if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
echo "$DATUM UPDATE !!! - UPDATE IP=$IP AN IPV64.NET GESENDET"
else else
echo "$DATUM UPDATE !!! - UPDATE IP= $IP NICHT GESENTET" echo "$DATUM UPDATE !!! - UPDATE IP=$IP NICHT GESENTET"
fi fi
# curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
fi fi
@@ -33,29 +34,30 @@ function CHECK_A_DOMAIN() {
DATUM=$(date +%Y-%m-%d\ %H:%M:%S) DATUM=$(date +%Y-%m-%d\ %H:%M:%S)
UPDIP=$(cat $PFAD/updip.txt) UPDIP=$(cat $PFAD/updip.txt)
# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1) # IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
IP=$(curl -4ssL https://ipv64.net/update.php?howismyip | jq -r 'to_entries[] | "\(.value)"') IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
# DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net) # DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net)
DOMAIN_CHECK=$(for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do dig +short ${DOMAIN} A @ns1.ipv64.net; done | tail -n 1) DOMAIN_CHECK=$(for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do dig +short ${DOMAIN} A @ns1.ipv64.net; done | tail -n 1)
sleep 1 sleep 1
if [ "$IP" == "$DOMAIN_CHECK" ]; then if [ "$IP" == "$DOMAIN_CHECK" ]; then
# echo "$DATUM CHECK - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" # echo "$DATUM CHECK - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM CHECK - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM CHECK - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done
else else
echo "$DATUM UPDATE !!! ..." echo "$DATUM UPDATE !!! ..."
echo "$DATUM UPDATE !!! - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT" echo "$DATUM UPDATE !!! - NACHEINTRAG DIE IP WIRD NOCH EINMAL GESETZT"
echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP= $UPDIP" echo "$DATUM UPDATE !!! - Update IP=$IP - Alte-IP=$UPDIP"
sleep 5 sleep 5
# curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min" # curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min"
UPDATE_IP=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min") UPDATE_IP=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
if [ "$UPDATE_IP" = "ok" ] ; then # if [ "$UPDATE_IP" = "ok" ] ; then
echo "$DATUM UPDATE !!! - UPDATE IP= $IP AN IPV64.NET GESENDET" if [[ "$UPDATE_IP" =~ (nochg|good|ok) ]] ; then
echo "$DATUM UPDATE !!! - UPDATE IP=$IP AN IPV64.NET GESENDET"
else else
echo "$DATUM UPDATE !!! - UPDATE IP= $IP NICHT GESENTET" echo "$DATUM UPDATE !!! - UPDATE IP=$IP NICHT GESENTET"
fi fi
# curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=<ipaddr>&ip6=<ip6addr>&output=min
sleep 15 sleep 15
# echo "$DATUM NACHEINTRAG - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" # echo "$DATUM NACHEINTRAG - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`"
for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM NACHEINTRAG - DOMAIN HAT DEN A-RECORD= `dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM NACHEINTRAG - DOMAIN HAT DEN A-RECORD=`dig +noall +answer ${DOMAIN} A @ns1.ipv64.net`"; done
fi fi
} }
CHECK_A_DOMAIN CHECK_A_DOMAIN

9
data/entrypoint.sh
View File

@@ -30,15 +30,16 @@ else
# echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN_IPV64" # echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN_IPV64"
for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN"; done for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN"; done
fi fi
if ! curl -sSL --fail https://ipv64.net/ > /dev/null; then if ! curl -sSL --user-agent "${CURL_USER_AGENT}" --fail https://ipv64.net/ > /dev/null; then
echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang" echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang"
exit 0 exit 0
fi fi
# IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1) # IP=$(curl -4s https://ipv64.net/wieistmeineip.php | grep -o '[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}' | tail -n 1)
# CHECK=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=$IP" | grep -o "success") # CHECK=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=$IP" | grep -o "success")
IP=$(curl -4ssL https://ipv64.net/update.php?howismyip | jq -r 'to_entries[] | "\(.value)"') IP=$(curl -4ssL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?howismyip" | jq -r 'to_entries[] | "\(.value)"')
CHECK=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min") CHECK=$(curl -4sSL --user-agent "${CURL_USER_AGENT}" "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}&output=min")
if [ "$CHECK" = "ok" ] ; then # if [ "$CHECK" = "ok" ] ; then
if [[ "$CHECK" =~ (nochg|good|ok) ]] ; then
echo "$DATUM CHECK - Die Angaben sind richtig gesetzt: DOMAIN und DOMAIN KEY" echo "$DATUM CHECK - Die Angaben sind richtig gesetzt: DOMAIN und DOMAIN KEY"
sleep 5 && for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM IP CHECK - Deine DOMAIN ${DOMAIN} HAT DIE IP=`dig +short ${DOMAIN} A @ns1.ipv64.net`"; done sleep 5 && for DOMAIN in $(echo "${DOMAIN_IPV64}" | sed -e "s/,/ /g"); do echo "$DATUM IP CHECK - Deine DOMAIN ${DOMAIN} HAT DIE IP=`dig +short ${DOMAIN} A @ns1.ipv64.net`"; done
else else

2
data/healthcheck.sh
View File

@@ -24,7 +24,7 @@ else
echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN_IPV64" echo "$DATUM DOMAIN - Deine DOMAIN $DOMAIN_IPV64"
fi fi
if ! curl -sSL --fail https://ipv64.net/ > /dev/null; then if ! curl -sSL --user-agent "${CURL_USER_AGENT}" --fail https://ipv64.net/ > /dev/null; then
echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang" echo "$DATUM FEHLER !!! - 404 Sie haben kein Netzwerk oder Internetzugang"
exit 1 exit 1
fi fi

2
docker-compose.yml
View File

@@ -4,7 +4,7 @@ services:
# build: # build:
# dockerfile: ./Dockerfile # dockerfile: ./Dockerfile
image: alcapone1933/ddns-ipv64:latest image: alcapone1933/ddns-ipv64:latest
# image: alcapone1933/ddns-ipv64:v0.0.4 # image: alcapone1933/ddns-ipv64:v0.0.6
container_name: ddns-ipv64 container_name: ddns-ipv64
restart: always restart: always
# volumes: # volumes: