From 7ba9079ae8273bd93997042b76e4dab6851c1d2d Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 1 Aug 2025 09:29:00 +0000
Subject: [PATCH 1/3] Initial plan


From 152533976f621cdc5dc154cc0aa30d5d892a93f9 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 1 Aug 2025 09:43:25 +0000
Subject: [PATCH 2/3] Add healthcheck to http_serve service in docker-compose

Co-authored-by: dannystaple <426859+dannystaple@users.noreply.github.com>
---
 docker-compose.yml | 6 ++++++
 serve.Dockerfile   | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 7e1e5d1b..1c5e4eed 100644
--- a/docker-compose.yml
+++ b/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
 
diff --git a/serve.Dockerfile b/serve.Dockerfile
index 126d7af2..29dcd9bf 100644
--- a/serve.Dockerfile
+++ b/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/http2.conf /usr/local/apache2/conf/httpd.conf
 
 FROM base

From fd78e51c9f2af6b2c10d3f58faa09417a30ec8d6 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Fri, 1 Aug 2025 10:11:12 +0000
Subject: [PATCH 3/3] Restore httpd configuration with correct file and fix
 dockerignore

Co-authored-by: dannystaple <426859+dannystaple@users.noreply.github.com>
---
 .dockerignore    | 1 -
 serve.Dockerfile | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 14f954de..8b5c83ec 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,7 +1,6 @@
 _site
 node_modules
 .git
-.github
 .editorconfig
 .gitattributes
 .gitignore
diff --git a/serve.Dockerfile b/serve.Dockerfile
index 29dcd9bf..01f3ee00 100644
--- a/serve.Dockerfile
+++ b/serve.Dockerfile
@@ -25,6 +25,6 @@ FROM httpd:2.4.64 AS httpd_serve
 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 /usr/local/apache2/conf/httpd.conf
+COPY .github/scripts/staging/default.conf /usr/local/apache2/conf/httpd.conf
 
 FROM base