diff --git a/Containers/apache/healthcheck.sh b/Containers/apache/healthcheck.sh index b11d8b5b..667c94d3 100644 --- a/Containers/apache/healthcheck.sh +++ b/Containers/apache/healthcheck.sh @@ -2,7 +2,7 @@ curl -skfI localhost:8000 || exit 1 if [ "$APACHE_PORT" != '443' ]; then - curl -skfI localhost:"$APACHE_PORT" || exit 1 + nc -z localhost "$APACHE_PORT" || exit 1 else - curl -skfI https://"$NC_DOMAIN":"$APACHE_PORT" || exit 1 + nc -z "$NC_DOMAIN" "$APACHE_PORT" || exit 1 fi diff --git a/Containers/collabora/Dockerfile b/Containers/collabora/Dockerfile index 173ec374..0eab5a39 100644 --- a/Containers/collabora/Dockerfile +++ b/Containers/collabora/Dockerfile @@ -9,9 +9,10 @@ RUN set -ex; \ export DEBIAN_FRONTEND=noninteractive; \ apt-get install -y --no-install-recommends \ tzdata \ + netcat \ ; \ rm -rf /var/lib/apt/lists/* USER 104 -HEALTHCHECK CMD curl -skfI localhost:9980 || exit 1 +HEALTHCHECK CMD nc -z localhost 9980 || exit 1 diff --git a/Containers/domaincheck/Dockerfile b/Containers/domaincheck/Dockerfile index ab09e156..57192bcc 100644 --- a/Containers/domaincheck/Dockerfile +++ b/Containers/domaincheck/Dockerfile @@ -1,5 +1,5 @@ FROM alpine:3.16.2 -RUN apk add --update --no-cache lighttpd bash curl +RUN apk add --update --no-cache lighttpd bash curl netcat-openbsd RUN adduser -S www-data -G www-data RUN rm -rf /etc/lighttpd/lighttpd.conf @@ -15,4 +15,4 @@ USER www-data RUN mkdir -p /var/www/domaincheck/ ENTRYPOINT ["/start.sh"] -HEALTHCHECK CMD curl -skfI localhost:$APACHE_PORT || exit 1 \ No newline at end of file +HEALTHCHECK CMD nc -z localhost $APACHE_PORT || exit 1 \ No newline at end of file diff --git a/Containers/imaginary/Dockerfile b/Containers/imaginary/Dockerfile index dd9ea352..a3e7c94c 100644 --- a/Containers/imaginary/Dockerfile +++ b/Containers/imaginary/Dockerfile @@ -8,8 +8,9 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ ca-certificates \ curl \ + netcat \ ; \ rm -rf /var/lib/apt/lists/* USER nobody -HEALTHCHECK CMD curl -skI 127.0.0.1:9000 || exit 1 \ No newline at end of file +HEALTHCHECK CMD nc -z localhost 9000 || exit 1 \ No newline at end of file diff --git a/Containers/nextcloud/Dockerfile b/Containers/nextcloud/Dockerfile index f536a699..24a3304d 100644 --- a/Containers/nextcloud/Dockerfile +++ b/Containers/nextcloud/Dockerfile @@ -252,4 +252,4 @@ RUN echo "root:$(openssl rand -base64 12)" | chpasswd USER www-data ENTRYPOINT ["/start.sh"] -HEALTHCHECK CMD (nc -z localhost 9000 && curl -skI localhost:7867) || exit 1 \ No newline at end of file +HEALTHCHECK CMD (nc -z localhost 9000 && nc -z localhost 7867) || exit 1 \ No newline at end of file diff --git a/Containers/talk/Dockerfile b/Containers/talk/Dockerfile index 1bbdd768..7e0e9e27 100644 --- a/Containers/talk/Dockerfile +++ b/Containers/talk/Dockerfile @@ -69,4 +69,4 @@ USER talk ENTRYPOINT ["start.sh"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] -HEALTHCHECK CMD (curl -skI localhost:8081 && curl -skI localhost:8188 && curl -skf --http0.9 localhost:4222 && nc -z localhost $TALK_PORT) || exit 1 \ No newline at end of file +HEALTHCHECK CMD (nc -z localhost 8081 && nc -z localhost 8188 && nc -z localhost 4222 && nc -z localhost $TALK_PORT) || exit 1 \ No newline at end of file