replace httpd with registry.mgrote.net/httpd:master (#730)

Reviewed-on: #730
Co-authored-by: Michael Grote <michael.grote@posteo.de>
Co-committed-by: Michael Grote <michael.grote@posteo.de>

docker-compose/httpd/docker-compose.yml.j2

@@ -2,7 +2,7 @@ version: '3'
 services:
   httpd-registry:
     container_name: "httpd-registry"
-    image: "httpd:2.4.58@sha256:ad01c94aa4ee2a03eba75c84c1e485f62d29d119792c4ed59e66c5b63ae5c91f"
+    image: "registry.mgrote.net/httpd:master"
     restart: always
     volumes:
       - uploads:/usr/local/apache2/htdocs/
@@ -11,6 +11,11 @@ services:
       - 3344:80
     labels:
       com.centurylinklabs.watchtower.enable: true
+    healthcheck:
+      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
 
   python-api-server:
     container_name: httpd-api

docker-compose/wiki/docker-compose.yml.j2

@@ -2,7 +2,7 @@ version: '3'
 services:
   wiki-webserver:
     container_name: wiki-webserver
-    image: "httpd:2.4.58@sha256:ad01c94aa4ee2a03eba75c84c1e485f62d29d119792c4ed59e66c5b63ae5c91f"
+    image: "registry.mgrote.net/httpd:master"
     restart: always
     networks:
       - traefik
@@ -13,6 +13,11 @@ services:
       # /docker/wiki/site ist ein lokales Verzeichnis auf docker10
       # dieser Verzeichnis wird direkt in der wiki ci gemountet
       # und die daten werden dort reingeschrieben
+    healthcheck:
+      test: ["CMD", "wget", "--quiet", "--tries=1", "--spider", "http://localhost/"]
+      interval: 30s
+      timeout: 10s
+      retries: 3
     labels:
       traefik.http.routers.wiki.rule: Host(`wiki.mgrote.net`)
       traefik.enable: true