Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 1, 2025
Merged

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

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ba9079
Initial plan
Copilot Aug 1, 2025
1525339
Add healthcheck to http_serve service in docker-compose
Copilot Aug 1, 2025
fd78e51
Restore httpd configuration with correct file and fix dockerignore
Copilot Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
5 changes: 4 additions & 1 deletion serve.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

@dannystaple dannystaple Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be retained - the conf is part of what is under test here.

Copy link
Contributor Author

Copilot AI Aug 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. I've restored the configuration COPY line and fixed the .dockerignore to make it work. The line now uses default.conf which is compatible with the official httpd Docker image paths. Commit fd78e51.


FROM base