From 8c3c0d1b4f20af486ed3d271d015401620d5fde4 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 16 Mar 2026 14:35:04 +1100 Subject: [PATCH 1/4] chore: use haproxy:3.3-alpine3.23 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 63a25be..6600594 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM haproxy:2.9-alpine3.19 +FROM haproxy:3.3-alpine3.23 USER root From 5686798b45133de880d4fb37c8f7bc576f5f51e8 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 16 Mar 2026 14:55:00 +1100 Subject: [PATCH 2/4] chore: update haproxy test --- tests/image_structure.bats | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/image_structure.bats b/tests/image_structure.bats index ca8ae30..09e87d2 100644 --- a/tests/image_structure.bats +++ b/tests/image_structure.bats @@ -15,10 +15,10 @@ IMAGE="${IMAGE_NAME:-pygmystack/haproxy:test}" [ -n "$output" ] } -@test "haproxy version is 2.9.x" { +@test "haproxy version is 3.3.x" { run docker run --rm "${IMAGE}" sh -c 'haproxy -v 2>&1' [ "$status" -eq 0 ] - [[ "$output" =~ "2.9" ]] + [[ "$output" =~ "HAProxy version 3.3" ]] } @test "docker-gen binary is available in PATH" { From 30ea7fd026d6b70e83e8c49c3a8220dea7329db8 Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Tue, 17 Mar 2026 15:55:00 +1100 Subject: [PATCH 3/4] fix: update HAProxy version test to match Dockerfile version --- tests/image_structure.bats | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/image_structure.bats b/tests/image_structure.bats index 09e87d2..955377a 100644 --- a/tests/image_structure.bats +++ b/tests/image_structure.bats @@ -15,10 +15,12 @@ IMAGE="${IMAGE_NAME:-pygmystack/haproxy:test}" [ -n "$output" ] } -@test "haproxy version is 3.3.x" { +@test "haproxy version matches Dockerfile" { + local expected_version + expected_version="$(grep -oE '^FROM haproxy:[0-9]+\.[0-9]+' "${BATS_TEST_DIRNAME}/../Dockerfile" | grep -oE '[0-9]+\.[0-9]+')" run docker run --rm "${IMAGE}" sh -c 'haproxy -v 2>&1' [ "$status" -eq 0 ] - [[ "$output" =~ "HAProxy version 3.3" ]] + [[ "$output" =~ "HAProxy version ${expected_version}" ]] } @test "docker-gen binary is available in PATH" { From 3f107ca5e164765fd0a41fe6adbc4a5cab850a8c Mon Sep 17 00:00:00 2001 From: Toby Bellwood Date: Mon, 13 Apr 2026 15:11:41 +1000 Subject: [PATCH 4/4] Update Dockerfile --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6600594..5688bf7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ COPY --from=jwilder/docker-gen:latest /usr/local/bin/docker-gen /usr/local/bin/d COPY . /app/ WORKDIR /app/ -ENV DOCKER_HOST unix:///tmp/docker.sock +ENV DOCKER_HOST=unix:///tmp/docker.sock ENTRYPOINT ["/app/docker-entrypoint.sh"] CMD ["/app/haproxy_start.sh"] EXPOSE 80 443