From d637666032b0030a95baf64910927c239e2684d3 Mon Sep 17 00:00:00 2001 From: alcapone1933 Date: Sun, 8 Jan 2023 18:49:04 +0100 Subject: [PATCH 1/3] demo Shoutrrr --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb6db8a..b0911b6 100644 --- a/README.md +++ b/README.md @@ -211,7 +211,7 @@ docker run --rm -it alcapone1933/shoutrrr send --verbose --url "< Shoutrrr URL >
DEMO Shoutrrr URL generieren - +
From 84a2b80e7c4a9e80e69400fecb967e374a98fed8 Mon Sep 17 00:00:00 2001 From: alcapone1933 Date: Mon, 6 Mar 2023 19:02:46 +0100 Subject: [PATCH 2/3] update --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index b0911b6..feb1ab9 100644 --- a/README.md +++ b/README.md @@ -174,10 +174,10 @@ Das sind Beispiele für Shoutrrr als Benachrichtigungsdienst, für weitere Servi | Service Name | URL Beispiel (Beispiel text) | | ------------ | ----------------------------------------------------------------------------------------------------------------------------- | -| gotify | `gotify://domain.de/123456abc/?title=DDNS IPV64 IP UPDATE&priority=5` | -| discord | `discord://123456abc@555555555555555?title=DDNS IPV64 IP UPDATE` | -| telegram | `telegram://1111111111:123456abc@telegram/?chats=5555555555&title=DDNS IPV64 IP UPDATE` | -| smtp (email) | `smtp://noreply@domain.de:password@mail.domain.de:587/?from=noreply@domain.de&to=user@domain.de&subject=DDNS IPV64 IP UPDATE` | +| gotify | `gotify://domain.de/123456abc/?title=DDNS+IPV64+IP+UPDATE&priority=5` | +| discord | `discord://123456abc@555555555555555?title=DDNS+IPV64+IP+UPDATE` | +| telegram | `telegram://1111111111:123456abc@telegram/?chats=5555555555&title=DDNS+IPV64+IP+UPDATE` | +| smtp (email) | `smtp://noreply@domain.de:password@mail.domain.de:587/?from=noreply@domain.de&to=user@domain.de&subject=DDNS+IPV64+IP+UPDATE` |   From 1c08c983aa657f8a643cfd77869e830cda309a82 Mon Sep 17 00:00:00 2001 From: alcapone1933 Date: Tue, 11 Apr 2023 18:56:11 +0200 Subject: [PATCH 3/3] v0.1.2 --- .drone.yml | 2 +- Dockerfile | 9 +++++---- LICENSE | 4 ++-- README.md | 1 + data/ddns-update-praefix.sh | 8 +++++++- data/ddns-update.sh | 8 +++++++- docker-compose.yml | 3 ++- 7 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.drone.yml b/.drone.yml index 760d514..80bf9a7 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.1.1 + auto_tag_suffix: v0.1.2 trigger: branch: diff --git a/Dockerfile b/Dockerfile index 57402a6..35eb2b9 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/ddns-ipv64" \ - org.opencontainers.image.version="v0.1.1" \ + org.opencontainers.image.version="v0.1.2" \ 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" @@ -12,9 +12,10 @@ LABEL maintainer="alcapone1933 " \ ENV TZ=Europe/Berlin \ CRON_TIME="*/15 * * * *" \ CRON_TIME_DIG="*/30 * * * *" \ - VERSION="v0.1.1" \ - CURL_USER_AGENT="docker-ddns-ipv64/version=v0.1.1 github.com/alcapone1933/docker-ddns-ipv64" \ - SHOUTRRR_URL="" + VERSION="v0.1.2" \ + CURL_USER_AGENT="docker-ddns-ipv64/version=v0.1.2 github.com/alcapone1933/docker-ddns-ipv64" \ + SHOUTRRR_URL="" \ + IP_CHECK="Yes" RUN apk add --update --no-cache tzdata curl bash tini bind-tools jq && \ rm -rf /var/cache/apk/* diff --git a/LICENSE b/LICENSE index c9abb36..f28fc56 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2022 alcapone1933 +Copyright (c) 2023 alcapone1933 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file +SOFTWARE. diff --git a/README.md b/README.md index feb1ab9..4d4aa1a 100644 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ services: | DEINE DOMAINS: z.b. deine-domain.ipv64.net, deine-domain.ipv64.de | DOMAIN_IPV64 | ------------------ | deine-domain.ipv64.net,deine-domain.ipv64.de | | DOMAIN PRAEFIX YES: Damit wird das Domain PRAEFIX aktiv genutzt | DOMAIN_PRAEFIX_YES | no | yes | | DEIN DOMAIN PRAEFIX (subdomain) : ⚠️ Nur ein Praefix verwenden ⚠️ z.b. ddns | DOMAIN_PRAEFIX | ------------------ | ddns | +| IP CHECK: Die IP Adresse der Domain wird überprüft | IP_CHECK | Yes | Yes | | SHOUTRRR URL: Deine Shoutrrr URL als Benachrichtigungsdienst z.b ( gotify,discord,telegram,email) | SHOUTRRR_URL | ------------------ | [Shoutrrr-Beispiele](#shoutrrr-beispiele) | * * * diff --git a/data/ddns-update-praefix.sh b/data/ddns-update-praefix.sh index cb28848..cce9f4a 100644 --- a/data/ddns-update-praefix.sh +++ b/data/ddns-update-praefix.sh @@ -151,5 +151,11 @@ else fi fi } -CHECK_A_DOMAIN + +if [[ "$IP_CHECK" =~ (YES|yes|Yes) ]] ; then + CHECK_A_DOMAIN +else + echo > /dev/null +fi + echo "==============================================================================================" diff --git a/data/ddns-update.sh b/data/ddns-update.sh index 5b6c96d..44f3c5d 100644 --- a/data/ddns-update.sh +++ b/data/ddns-update.sh @@ -152,5 +152,11 @@ else fi fi } -CHECK_A_DOMAIN + +if [[ "$IP_CHECK" =~ (YES|yes|Yes) ]] ; then + CHECK_A_DOMAIN +else + echo > /dev/null +fi + echo "==============================================================================================" diff --git a/docker-compose.yml b/docker-compose.yml index d45dbf4..2b08e05 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,7 @@ services: # build: # dockerfile: ./Dockerfile image: alcapone1933/ddns-ipv64:latest - # image: alcapone1933/ddns-ipv64:v0.1.1 + # image: alcapone1933/ddns-ipv64:v0.1.2 container_name: ddns-ipv64 restart: always # volumes: @@ -18,6 +18,7 @@ services: # - "DOMAIN_PRAEFIX_YES=yes" # ⚠️ Hier bitte nur ein DOMAIN PRAEFIX (subdomain) eintragen (ersetzen) ⚠️ # - "DOMAIN_PRAEFIX=ddns" + # - "IP_CHECK=Yes" - "DOMAIN_KEY=1234567890abcdefghijklmn" # - "SHOUTRRR_URL=" # volumes: