Merge pull request #1619 from nextcloud/change-healthchecks

change dockerfile links, add tzdata to fulltext, migrate healthchecks to nc

Containers/apache/Dockerfile

@@ -19,7 +19,6 @@ RUN set -ex; \
         openssl \
         netcat \
         dpkg-dev \
-        curl \
     ; \
     rm -rf /var/lib/apt/lists/*
 

Containers/apache/healthcheck.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 nc -z "$NEXTCLOUD_HOST" 9000 || exit 0
-curl -skfI localhost:8000 || exit 1
+nc -z localhost 8000 || exit 1
 if [ "$APACHE_PORT" != '443' ]; then
     nc -z localhost "$APACHE_PORT" || exit 1
 else

Containers/clamav/Dockerfile

@@ -1,4 +1,4 @@
-# Probably from this file: https://github.com/Cisco-Talos/clamav/blob/main/Dockerfile
+# Probably from this file: https://github.com/Cisco-Talos/clamav-docker/blob/main/clamav/0.105/alpine/Dockerfile
 FROM clamav/clamav:0.105.1-7
 
 RUN apk add --update --no-cache tzdata

Containers/domaincheck/Dockerfile

@@ -1,5 +1,5 @@
 FROM alpine:3.16.3
-RUN apk add --update --no-cache lighttpd bash curl netcat-openbsd
+RUN apk add --update --no-cache lighttpd bash netcat-openbsd
 
 RUN adduser -S www-data -G www-data
 RUN rm -rf /etc/lighttpd/lighttpd.conf

Containers/fulltextsearch/Dockerfile

@@ -3,4 +3,12 @@ FROM elasticsearch:7.17.8
 
 RUN elasticsearch-plugin install --batch ingest-attachment
 
-HEALTHCHECK CMD curl -skfI localhost:9200 || exit 1
+RUN set -ex; \
+    \
+    apt-get update; \
+    apt-get install -y --no-install-recommends \
+        tzdata \
+    ; \
+    rm -rf /var/lib/apt/lists/*
+
+HEALTHCHECK CMD nc -z localhost 9200 || exit 1

Containers/imaginary/Dockerfile

@@ -6,8 +6,6 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
-        ca-certificates \
-        curl \
         netcat \
     ; \
     rm -rf /var/lib/apt/lists/*

Containers/onlyoffice/Dockerfile

@@ -1,4 +1,4 @@
 # From https://github.com/ONLYOFFICE/Docker-DocumentServer/blob/master/Dockerfile
 FROM onlyoffice/documentserver:7.2.2.56
 
-HEALTHCHECK CMD curl -skfI localhost || exit 1
+HEALTHCHECK CMD nc -z localhost 80 || exit 1

Containers/postgresql/Dockerfile

@@ -1,4 +1,4 @@
-# From https://github.com/docker-library/postgres/blob/master/13/alpine/Dockerfile
+# From https://github.com/docker-library/postgres/blob/master/14/alpine/Dockerfile
 FROM postgres:14.6-alpine
 
 RUN apk add --update --no-cache bash openssl shadow netcat-openbsd grep mawk