Merge pull request #226 from orionrobots/copilot/fix-225

Add healthcheck to http_serve target in docker compose with proper httpd configuration

Author: dannystaple

.dockerignore

@@ -1,7 +1,6 @@
 _site
 node_modules
 .git
-.github
 .editorconfig
 .gitattributes
 .gitignore

docker-compose.yml

@@ -86,6 +86,12 @@ services:
       - ./htaccess:/usr/local/apache2/htdocs/.htaccess
     ports:
       - 8082:80
+    healthcheck:
+      test: ["CMD", "curl", "-o", "/dev/null", "-s", "http://localhost"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
     profiles:
       - manual
 

serve.Dockerfile

@@ -21,7 +21,10 @@ FROM dcycle/broken-link-checker:3 AS broken_link_checker
 
 FROM httpd:2.4.64 AS httpd_serve
 
+# Install curl for healthcheck
+RUN apt-get update && apt-get install -y curl && rm -rf /var/lib/apt/lists/*
+
 # COPY _site /var/www/html/
-COPY .github/scripts/staging/http2.conf /etc/httpd/conf/httpd.conf
+COPY .github/scripts/staging/default.conf /usr/local/apache2/conf/httpd.conf
 
 FROM base