add healthcheck

simplerisk · Oct 2, 2023 · ec97507 · ec97507
1 parent 402004c
commit ec97507
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 1 deletion.
diff --git a/simplerisk-minimal/generate_dockerfile.sh b/simplerisk-minimal/generate_dockerfile.sh
@@ -119,6 +119,9 @@ ENTRYPOINT [ "/entrypoint.sh" ]
 EXPOSE 80
 EXPOSE 443
 
+HEALTHCHECK --interval=1m \\
+	CMD curl --fail http://localhost || exit 1
+
 # Start Apache 
 CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
 EOF

diff --git a/simplerisk-minimal/php81/Dockerfile b/simplerisk-minimal/php81/Dockerfile
@@ -49,7 +49,7 @@ RUN echo 'upload_max_filesize = 5M' >> /usr/local/etc/php/conf.d/docker-php-uplo
 	echo 'log_errors = On' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \
 	echo 'error_log = /dev/stderr' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \
 	echo 'display_errors = Off' >> /usr/local/etc/php/conf.d/docker-php-error_logging.ini && \
-	
+
 # Create SSL Certificates for Apache SSL
 	echo $(< /dev/urandom tr -dc _A-Z-a-z-0-9 | head -c${1:-32}) > /tmp/pass_openssl.txt && \
 	mkdir -p /etc/apache2/ssl/ssl.crt /etc/apache2/ssl/ssl.key && \
@@ -94,5 +94,8 @@ ENTRYPOINT [ "/entrypoint.sh" ]
 EXPOSE 80
 EXPOSE 443
 
+HEALTHCHECK --interval=1m \
+	CMD curl --fail http://localhost || exit 1
+
 # Start Apache 
 CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
diff --git a/simplerisk/generate_dockerfile.sh b/simplerisk/generate_dockerfile.sh
@@ -140,6 +140,9 @@ VOLUME [ "/passwords", "/configurations", "/var/log", "/var/lib/mysql", "/etc/ap
 # Setting up entrypoint
 ENTRYPOINT [ "/entrypoint.sh" ]
 
+HEALTHCHECK --interval=1m \\
+	CMD curl --fail http://localhost || exit 1
+
 # Start Apache and MySQL
 CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]
 EOF

diff --git a/simplerisk/jammy/Dockerfile b/simplerisk/jammy/Dockerfile
@@ -109,5 +109,8 @@ VOLUME [ "/passwords", "/configurations", "/var/log", "/var/lib/mysql", "/etc/ap
 # Setting up entrypoint
 ENTRYPOINT [ "/entrypoint.sh" ]
 
+HEALTHCHECK --interval=1m \
+	CMD curl --fail http://localhost || exit 1
+
 # Start Apache and MySQL
 CMD ["/usr/bin/supervisord", "-n", "-c", "/etc/supervisor/supervisord.conf"]