From a9aa35f68652151e53b03360ddc8e633dc9221b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:33:49 -0600 Subject: [PATCH 1/6] Add nsupdate This is needed for the nsupdate dns api provider --- haproxy-acme/data/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/haproxy-acme/data/Dockerfile b/haproxy-acme/data/Dockerfile index 38b07d6..758b55b 100644 --- a/haproxy-acme/data/Dockerfile +++ b/haproxy-acme/data/Dockerfile @@ -67,14 +67,15 @@ RUN echo '. "/usr/local/share/acme/acme.sh.env"' >> /var/lib/haproxy/.bashrc && chown haproxy:haproxy /var/lib/haproxy/.bashrc && \ chmod 0644 /var/lib/haproxy/.bashrc -# Install 'supervisord' and 'acme.sh' dependencies +# Install 'supervisord', direct 'acme.sh' dependencies, and 'acme.sh' DNS API dependencies. RUN apt-get install -y --no-install-recommends \ supervisor \ ca-certificates \ curl \ socat \ - idn + idn \ + nsupdate COPY --chown=haproxy:haproxy supervisord.conf /etc/supervisord.conf From f02bf21cbfab01e8de9b2d7956db108913cf697c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:34:08 -0600 Subject: [PATCH 2/6] update to debian trixie --- haproxy-acme/data/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haproxy-acme/data/Dockerfile b/haproxy-acme/data/Dockerfile index 758b55b..97d10d3 100644 --- a/haproxy-acme/data/Dockerfile +++ b/haproxy-acme/data/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_IMAGE=haproxy:bookworm +ARG BASE_IMAGE=haproxy:trixie FROM $BASE_IMAGE From ae3537236cab6e8d5a01a13c6cc984930ba99818 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:37:05 -0600 Subject: [PATCH 3/6] forgot it was bind9-dnsutils --- haproxy-acme/data/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/haproxy-acme/data/Dockerfile b/haproxy-acme/data/Dockerfile index 97d10d3..5862d9d 100644 --- a/haproxy-acme/data/Dockerfile +++ b/haproxy-acme/data/Dockerfile @@ -75,7 +75,7 @@ RUN apt-get install -y --no-install-recommends \ curl \ socat \ idn \ - nsupdate + bind9-dnsutils COPY --chown=haproxy:haproxy supervisord.conf /etc/supervisord.conf From c5e4b64961c859c89b631eabb221e53e88d91272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:44:31 -0600 Subject: [PATCH 4/6] Update cd.yaml to use trixie --- .github/workflows/cd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index d9949c3..8b40427 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -61,7 +61,7 @@ jobs: image: flobernd/haproxy-acme context: ./haproxy-acme/data build-args: | - BASE_IMAGE=haproxy:${{ inputs.version-major }}.${{ inputs.version-minor }}-bookworm + BASE_IMAGE=haproxy:${{ inputs.version-major }}.${{ inputs.version-minor }}-trixie platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]' tags: | ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }}.${{ inputs.version-minor }} From 2073773b971e44d738e600a937a09959f4fc008f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:50:10 -0600 Subject: [PATCH 5/6] remove mips64le from ci --- .github/workflows/ci.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2e1798c..310809c 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -59,7 +59,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max push: true - # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x + # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x build-args: | BASE_IMAGE=${{ env.BASE_IMAGE }} tags: ${{ steps.meta-haproxy-acme.outputs.tags }} @@ -87,7 +87,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max push: true - # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x + # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x build-args: | BASE_IMAGE=${{ fromJSON(steps.build-haproxy-acme.outputs.metadata)['image.name'] }} tags: ${{ steps.meta-haproxy-acme-http01.outputs.tags }} @@ -115,7 +115,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max push: true - # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x + # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x build-args: | BASE_IMAGE=${{ fromJSON(steps.build-haproxy-acme.outputs.metadata)['image.name'] }} tags: ${{ steps.meta-haproxy-acme-dns01.outputs.tags }} @@ -143,7 +143,7 @@ jobs: cache-from: type=gha cache-to: type=gha,mode=max push: true - # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/mips64le,linux/ppc64le,linux/s390x + # platforms: linux/386,linux/amd64,linux/arm/v5,linux/arm/v7,linux/arm64,linux/ppc64le,linux/s390x build-args: | BASE_IMAGE=${{ fromJSON(steps.build-haproxy-acme.outputs.metadata)['image.name'] }} tags: ${{ steps.meta-haproxy-acme-tlsalpn01.outputs.tags }} From 49e7d168176d9d7b149f08d037beffe6c852b2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zo=C3=AB=20Gidiere?= Date: Fri, 15 Aug 2025 16:50:57 -0600 Subject: [PATCH 6/6] remove mips64le from cd --- .github/workflows/cd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml index 8b40427..f5d517a 100644 --- a/.github/workflows/cd.yaml +++ b/.github/workflows/cd.yaml @@ -62,7 +62,7 @@ jobs: context: ./haproxy-acme/data build-args: | BASE_IMAGE=haproxy:${{ inputs.version-major }}.${{ inputs.version-minor }}-trixie - platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]' + platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x"]' tags: | ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }}.${{ inputs.version-minor }} ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }} @@ -86,7 +86,7 @@ jobs: context: ./haproxy-acme-http01/data build-args: | BASE_IMAGE=ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }}.${{ inputs.version-minor }} - platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]' + platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x"]' tags: | ghcr.io/flobernd/haproxy-acme-http01:${{ inputs.version-major }}.${{ inputs.version-minor }} ghcr.io/flobernd/haproxy-acme-http01:${{ inputs.version-major }} @@ -110,7 +110,7 @@ jobs: context: ./haproxy-acme-dns01/data build-args: | BASE_IMAGE=ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }}.${{ inputs.version-minor }} - platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]' + platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x"]' tags: | ghcr.io/flobernd/haproxy-acme-dns01:${{ inputs.version-major }}.${{ inputs.version-minor }} ghcr.io/flobernd/haproxy-acme-dns01:${{ inputs.version-major }} @@ -134,7 +134,7 @@ jobs: context: ./haproxy-acme-tlsalpn01/data build-args: | BASE_IMAGE=ghcr.io/flobernd/haproxy-acme:${{ inputs.version-major }}.${{ inputs.version-minor }} - platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]' + platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/ppc64le", "linux/s390x"]' tags: | ghcr.io/flobernd/haproxy-acme-tlsalpn01:${{ inputs.version-major }}.${{ inputs.version-minor }} ghcr.io/flobernd/haproxy-acme-tlsalpn01:${{ inputs.version-major }}