diff --git a/.drone.yml b/.drone.yml index efb9a06..cb95e44 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,7 +37,7 @@ steps: repo: alcapone1933/ddns-ipv64 # tags: latest auto_tag: true - auto_tag_suffix: v0.0.2 + auto_tag_suffix: v0.0.3 trigger: branch: @@ -68,7 +68,7 @@ steps: repo: ghcr.io/alcapone1933/ddns-ipv64 # tags: latest auto_tag: true - auto_tag_suffix: v0.0.2 + auto_tag_suffix: v0.0.3 trigger: branch: diff --git a/Dockerfile b/Dockerfile index 0548ab9..004a6bb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,7 +4,7 @@ LABEL maintainer="alcapone1933 " \ org.opencontainers.image.created="$(date +%Y-%m-%d\ %H:%M)" \ org.opencontainers.image.authors="alcapone1933 " \ org.opencontainers.image.url="https://hub.docker.com/r/alcapone1933/drone-build-test" \ - org.opencontainers.image.version="v.0.0.1" \ + org.opencontainers.image.version="v0.0.3" \ org.opencontainers.image.ref.name="alcapone1933/ddns-ipv64" \ org.opencontainers.image.title="DDNS Updater ipv64.net" \ org.opencontainers.image.description="Community DDNS Updater fuer ipv64.net" @@ -23,5 +23,5 @@ RUN mv /data/entrypoint.sh /usr/local/bin/entrypoint.sh && mv /data/cronjob /etc # VOLUME [ "/data" ] ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/entrypoint.sh"] -HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=5 CMD curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1 -# HEALTHCHECK --interval=5s --timeout=30s --start-period=5s --retries=2 CMD /usr/local/bin/healthcheck.sh \ No newline at end of file +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=2 CMD /usr/local/bin/healthcheck.sh diff --git a/data/cronjob b/data/cronjob index d61cb41..d081467 100644 --- a/data/cronjob +++ b/data/cronjob @@ -1,3 +1,3 @@ # Cronjob DDNS Updater ipv64.net */15 * * * * /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1 -00 06 * * * echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A`" >> /var/log/cron.log 2>&1 \ No newline at end of file +*/30 * * * * sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1 diff --git a/data/ddns-update.sh b/data/ddns-update.sh index 8c45275..4e9d1ba 100644 --- a/data/ddns-update.sh +++ b/data/ddns-update.sh @@ -4,7 +4,7 @@ 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) UPDIP=$(cat $PFAD/updip.txt) -sleep 2 +sleep 1 if [ "$IP" == "$UPDIP" ]; then echo @@ -12,9 +12,8 @@ if [ "$IP" == "$UPDIP" ]; then echo else echo - echo "$DATUM Update ..." - sleep 1 - echo "$DATUM UPDATE!!! - Update IP= $IP - Alte-IP: $UPDIP" + echo "$DATUM UPDATE !!! ..." + echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP: $UPDIP" sleep 1 echo "$IP" > $PFAD/updip.txt echo @@ -22,3 +21,31 @@ else # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=&ip6= echo fi +sleep 5 +# Nachpruefung ob der DOMAIN Eintrag richtig gesetzt ist +function CHECK_A_DOMAIN() { +DATUM=$(date +%Y-%m-%d\ %H:%M:%S) +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) +DOMAIN_CHECK=$(dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net) +sleep 1 +if [ "$IP" == "$DOMAIN_CHECK" ]; then + echo + echo "$DATUM CHECK - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" + echo +else + echo + echo "$DATUM UPDATE !!! ..." + echo "$DATUM UPDATE !!! - NACHEINTAG DIE IP WIRD NOCH EINMAL GESETZT" + echo "$DATUM UPDATE !!! - Update IP= $IP - Alte-IP: $UPDIP" + sleep 5 + echo + curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}" + # curl -4sSL https://ipv64.net/update.php?key=${DOMAIN_KEY}=${DOMAIN_IPV64}&ip=&ip6= + sleep 15 + echo + echo "$DATUM NACHEINTAG - DOMAIN HAT DEN IP EINTRAG: `dig +noall +answer ${DOMAIN_IPV64} A @ns1.ipv64.net`" + echo +fi +} +CHECK_A_DOMAIN diff --git a/data/entrypoint.sh b/data/entrypoint.sh index ad442ec..eaa0284 100644 --- a/data/entrypoint.sh +++ b/data/entrypoint.sh @@ -1,16 +1,16 @@ #!/usr/bin/env bash # set -x set -e -sleep 15 +sleep 10 echo "================================ START DDNS UPDATER IPV64.NET ================================" if [ -z "${DOMAIN_KEY:-}" ] ; then - echo + echo echo "Sie haben keinen DOMAIN Key gesetzt, schauen die unter https://ipv64.net/dyndns.php nach bei DynDNS Updatehash" echo exit 1 else - echo + echo echo "Sie haben einen DOMAIN Key gesetzt" echo fi @@ -30,20 +30,20 @@ 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) # CHECK=$(curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=$IP" | grep -o "success") -if [ "`curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=$IP" | grep -o "success"`" = "success" ] ; then +if [ "`curl -4sSL "https://ipv64.net/update.php?key=${DOMAIN_KEY}&domain=${DOMAIN_IPV64}&ip=${IP}" | grep -o "success"`" = "success" ] ; then echo - echo "Die Angaben sind richtig gesetzt : DOMAIN und DOMAIN KEY" + echo "Die Angaben sind richtig gesetzt: DOMAIN und DOMAIN KEY" echo else echo - echo "Die Angaben sind falsch gesetzt : DOMAIN oder DOMAIN KEY" + echo "Die Angaben sind falsch gesetzt: DOMAIN oder DOMAIN KEY" echo exit 1 fi -echo "$IP" > /data/updip.txt +echo "${IP}" > /data/updip.txt curl -sSL --fail https://ipv64.net/ > /dev/null || exit 1 echo "${CRON_TIME} /bin/bash /data/ddns-update.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/container_cronjob -echo "$CRON_TIME_DIG" 'echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob +echo "$CRON_TIME_DIG" 'sleep 20 && echo "`date +%Y-%m-%d\ %H:%M:%S` Deine DOMAIN ${DOMAIN_IPV64} HAT DIE IP=`dig +short ${DOMAIN_IPV64} A @ns1.ipv64.net`" >> /var/log/cron.log 2>&1' >> /etc/cron.d/container_cronjob sleep 2 @@ -51,4 +51,4 @@ sleep 2 /usr/sbin/crond set tail -f /var/log/cron.log "$@" -exec "$@" \ No newline at end of file +exec "$@" diff --git a/docker-compose.yml b/docker-compose.yml index bf766e6..352745d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,6 +4,7 @@ services: # build: # dockerfile: ./Dockerfile image: alcapone1933/ddns-ipv64:latest + # image: alcapone1933/ddns-ipv64:v0.0.3 container_name: ddns-ipv64 restart: always # volumes: