Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .github/workflows/cd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
image: flobernd/haproxy-acme
context: ./haproxy-acme/data
build-args: |
BASE_IMAGE=haproxy:${{ inputs.version-major }}.${{ inputs.version-minor }}-bookworm
platforms: '["linux/386", "linux/amd64", "linux/arm/v5", "linux/arm/v7", "linux/arm64", "linux/mips64le", "linux/ppc64le", "linux/s390x"]'
BASE_IMAGE=haproxy:${{ inputs.version-major }}.${{ inputs.version-minor }}-trixie
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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand All @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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 }}
Expand Down
7 changes: 4 additions & 3 deletions haproxy-acme/data/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG BASE_IMAGE=haproxy:bookworm
ARG BASE_IMAGE=haproxy:trixie

FROM $BASE_IMAGE

Expand Down Expand Up @@ -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 \
bind9-dnsutils

COPY --chown=haproxy:haproxy supervisord.conf /etc/supervisord.conf

Expand Down