Add health check to java base image (DRAFT)

apache2-shibboleth/Dockerfile

@@ -33,3 +33,11 @@ EXPOSE 80
 # Start Shibboleth and Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["/usr/local/bin/shib.sh"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

apache2/Dockerfile

@@ -45,3 +45,11 @@ EXPOSE 80
 # Start Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apachectl", "-D", "FOREGROUND"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

haproxy28/Dockerfile

@@ -1,3 +1,18 @@
 FROM haproxy:2.8
+
+USER root
+RUN apt-get update && \
+    apt-get install -y curl && \
+    rm -rf /var/lib/apt/lists/* \
+USER haproxy
+
 COPY conf/haproxy.pem /usr/local/etc/haproxy
 
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health
+

java21/Dockerfile

@@ -1 +1,9 @@
 FROM eclipse-temurin:21-jre-alpine
+RUN apk add --no-cache curl
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php72-apache2-node14-composer2/Dockerfile

@@ -25,3 +25,11 @@ RUN mkdir /var/www/html/public
 
 RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php72-apache2-node16-composer2/Dockerfile

@@ -25,3 +25,11 @@ RUN mkdir /var/www/html/public
 
 RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php72-apache2/Dockerfile

@@ -86,3 +86,11 @@ EXPOSE 80
 # Start Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php82-apache2-node20-composer2/Dockerfile

@@ -25,3 +25,11 @@ RUN mkdir -p /var/www/html/public
 
 RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php82-apache2/Dockerfile

@@ -72,3 +72,11 @@ EXPOSE 80
 # Start Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php85-apache2-node24/Dockerfile

@@ -24,3 +24,11 @@ RUN mkdir -p /var/www/html/public
 
 RUN rm -rf /etc/apache2/sites-enabled/*
 COPY ./conf/appconf.conf /etc/apache2/sites-enabled/
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

php85-apache2/Dockerfile

@@ -76,3 +76,11 @@ EXPOSE 80
 # Start Apache
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["apache2-foreground"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health

satosa/Dockerfile

@@ -1,4 +1,8 @@
 FROM docker.io/satosa:8
+USER root:root
+RUN apt-get update && \
+    apt-get install -y curl && \
+    rm -rf /var/lib/apt/lists/*
 
 COPY ./conf/openconext-entrypoint.sh /usr/local/bin/
 
@@ -8,3 +12,11 @@ USER root:root
 
 # https://stackoverflow.com/questions/47062854/custom-docker-image-doesnt-inherit-cmd/47063296#47063296
 CMD ["gunicorn","-b0.0.0.0:8080","satosa.wsgi:app"]
+
+HEALTHCHECK \
+      --start-period=30s \
+      --start-interval=1s \
+      --interval=10s \
+      --timeout=1s \
+      --retries=20 \
+      CMD curl --fail -s -o /dev/null -w "%{http_code}" http://localhost/internal/health