From 63426c3cd023922a6e3c5f3aa40c4cc95f1d9fe1 Mon Sep 17 00:00:00 2001 From: DerLinkman Date: Thu, 8 Feb 2024 15:55:26 +0100 Subject: [PATCH] unbound: remove netcat check & package --- data/Dockerfiles/unbound/Dockerfile | 3 +-- data/Dockerfiles/unbound/healthcheck.sh | 27 ------------------------- 2 files changed, 1 insertion(+), 29 deletions(-) diff --git a/data/Dockerfiles/unbound/Dockerfile b/data/Dockerfiles/unbound/Dockerfile index f6d072cc..3090895b 100644 --- a/data/Dockerfiles/unbound/Dockerfile +++ b/data/Dockerfiles/unbound/Dockerfile @@ -5,7 +5,6 @@ LABEL maintainer "The Infrastructure Company GmbH GmbH " RUN apk add --update --no-cache \ curl \ bind-tools \ - netcat-openbsd \ unbound \ bash \ openssl \ @@ -20,7 +19,7 @@ EXPOSE 53/udp 53/tcp COPY docker-entrypoint.sh /docker-entrypoint.sh -# healthcheck (dig, ping, nc) +# healthcheck (dig, ping) COPY healthcheck.sh /healthcheck.sh RUN chmod +x /healthcheck.sh HEALTHCHECK --interval=30s --timeout=30s CMD [ "/healthcheck.sh" ] diff --git a/data/Dockerfiles/unbound/healthcheck.sh b/data/Dockerfiles/unbound/healthcheck.sh index a96eaab4..8da79bd7 100644 --- a/data/Dockerfiles/unbound/healthcheck.sh +++ b/data/Dockerfiles/unbound/healthcheck.sh @@ -50,27 +50,6 @@ function check_dns() { } -# Simple Netcat Check to connect to common webports -function check_netcat() { - declare -a domains=("mailcow.email" "github.com" "hub.docker.com") - declare -a ports=("80" "443") - - for domain in "${domains[@]}" ; do - for port in "${ports[@]}" ; do - nc -z -w 2 $domain $port - if [ $? -ne 0 ]; then - log_to_file "Healthcheck: Could not reach $domain on Port $port... Gave up!" - log_to_file "Please check your internet connection or firewall rules to fix this error." - return 1 - fi - done - done - - log_to_file "Healthcheck: Netcat Checks WORKING properly!" - return 0 - -} - if [[ ${SKIP_UNBOUND_HEALTHCHECK} == "y" ]]; then log_to_file "Healthcheck: ALL CHECKS WERE SKIPPED! Unbound is healthy!" exit 0 @@ -89,11 +68,5 @@ if [ $? -ne 0 ]; then exit 1 fi -check_netcat - -if [ $? -ne 0 ]; then - exit 1 -fi - log_to_file "Healthcheck: ALL CHECKS WERE SUCCESSFUL! Unbound is healthy!" exit 0 \ No newline at end of file