badblocks/docker-easy-haproxy
1
0
Fork 0
Code Activity

Migrate configuration paths to /etc/easyhaproxy and improve health check support in E2E tests

Browse source 
- Refactored HAProxy configuration files, templates, and paths to use `/etc/easyhaproxy` instead of `/etc/haproxy`.
- Updated Dockerfile to generate DH params and placeholder certificates in the new configuration directory.
- Added health check support with timeout to `DockerComposeFixture` in E2E test utilities.
- Adjusted tests, templates, and plugins to use the new `Consts`-based configuration paths.
- Introduced pytest fixtures for environment isolation and temporary directory management.
This commit is contained in:
Joao Gilberto Magalhaes 2026-02-15 14:32:16 -05:00
parent 3e963228f3
commit 045dd3817e
73 changed files with 600 additions and 287 deletions
Download patch file Download diff file Expand all files Collapse all files

13
build/Dockerfile
View file

@ -10,8 +10,17 @@ RUN apk add --no-cache haproxy bash python3 certbot openssl curl \
&& curl -LsSf https://astral.sh/uv/install.sh | sh \
&& ln -s /root/.local/bin/uv /usr/local/bin/uv
RUN openssl dhparam -out /etc/haproxy/dhparam 2048 \
&& openssl dhparam -out /etc/haproxy/dhparam-1024 1024
RUN mkdir -p /etc/easyhaproxy/haproxy \
&& openssl dhparam -out /etc/easyhaproxy/haproxy/dhparam 2048 \
&& openssl dhparam -out /etc/easyhaproxy/haproxy/dhparam-1024 1024 \
&& mkdir -p /etc/easyhaproxy/certs/certbot /etc/easyhaproxy/certs/haproxy \
&& openssl req -x509 -newkey rsa:2048 -nodes -days 365 \
-keyout /tmp/placeholder.key \
-out /tmp/placeholder.crt \
-subj "/CN=placeholder" \
&& cat /tmp/placeholder.crt /tmp/placeholder.key > /etc/easyhaproxy/certs/certbot/placeholder.pem \
&& cat /tmp/placeholder.crt /tmp/placeholder.key > /etc/easyhaproxy/certs/haproxy/placeholder.pem \
&& rm /tmp/placeholder.key /tmp/placeholder.crt
WORKDIR /scripts

5
build/assets/etc/easyhaproxy/haproxy/conf.d/README.md Normal file
View file

@ -0,0 +1,5 @@
# Custom HAProxy Configuration
Put `.cfg` files here to be included in the HAProxy configuration.
These files will be available at `/etc/easyhaproxy/haproxy/conf.d/` inside the container.

2
build/assets/etc/haproxy/errors-custom/400.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/400.http
View file

@ -4,7 +4,7 @@ Connection: close
Content-Type: text/html
<!DOCTYPE html>
<html>
<html>Ins
<head>
<meta charset="UTF-8">
<title>400 Bad request</title>

0
build/assets/etc/haproxy/errors-custom/403.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/403.http
View file

0
build/assets/etc/haproxy/errors-custom/408.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/408.http
View file

0
build/assets/etc/haproxy/errors-custom/500.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/500.http
View file

0
build/assets/etc/haproxy/errors-custom/502.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/502.http
View file

0
build/assets/etc/haproxy/errors-custom/503.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/503.http
View file

0
build/assets/etc/haproxy/errors-custom/504.http → build/assets/etc/easyhaproxy/haproxy/errors-custom/504.http
View file

3
build/assets/etc/haproxy/conf.d/README.md
View file

@ -1,3 +0,0 @@
# Custom HAProxy
Put files .cfg to be included in the configuration