Skip to content

Commit d3582ce

Browse files
byjgbyjg
authored
Merge pull request #80 from byjg/fix-fastcgi
Add protocol support and enhance FastCGI plugin configuration
2 parents 2b7b2c8 + 3dc3e3d commit d3582ce

29 files changed

Lines changed: 1131 additions & 410 deletions

‎.github/workflows/build.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434

3535
steps:
3636
- name: Checkout repository
37-
uses: actions/checkout@v4
37+
uses: actions/checkout@v7
3838

3939
- name: Install uv
4040
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -58,7 +58,7 @@ jobs:
5858

5959
steps:
6060
- name: Checkout repository
61-
uses: actions/checkout@v4
61+
uses: actions/checkout@v7
6262

6363
- name: Install uv
6464
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -82,7 +82,7 @@ jobs:
8282

8383
steps:
8484
- name: Checkout repository
85-
uses: actions/checkout@v4
85+
uses: actions/checkout@v7
8686

8787
- name: Install uv
8888
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -106,7 +106,7 @@ jobs:
106106

107107
steps:
108108
- name: Checkout repository
109-
uses: actions/checkout@v4
109+
uses: actions/checkout@v7
110110

111111
- name: Install uv
112112
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -138,7 +138,7 @@ jobs:
138138

139139
steps:
140140
- name: Checkout repository
141-
uses: actions/checkout@v4
141+
uses: actions/checkout@v7
142142

143143
- name: Install uv
144144
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -170,17 +170,17 @@ jobs:
170170

171171
steps:
172172
- name: Checkout repository
173-
uses: actions/checkout@v4
173+
uses: actions/checkout@v7
174174

175175
- name: Set up QEMU
176-
uses: docker/setup-qemu-action@v3
176+
uses: docker/setup-qemu-action@v4
177177

178178
- name: Set up Docker Buildx
179-
uses: docker/setup-buildx-action@v3
179+
uses: docker/setup-buildx-action@v4
180180

181181
- name: Log into registry
182182
if: github.event_name == 'push' || github.event.inputs.push == 'true'
183-
uses: docker/login-action@v3
183+
uses: docker/login-action@v4
184184
with:
185185
registry: ${{ secrets.DOCKER_REGISTRY }}
186186
username: ${{ secrets.DOCKER_REGISTRY_USER }}
@@ -190,11 +190,11 @@ jobs:
190190
# https://github.com/docker/metadata-action
191191
- name: Extract Docker metadata
192192
id: meta
193-
uses: docker/metadata-action@v5
193+
uses: docker/metadata-action@v6
194194
with:
195195
images: ${{ secrets.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}
196196

197-
- uses: actions/github-script@v6
197+
- uses: actions/github-script@v9
198198
id: tags
199199
with:
200200
script: |
@@ -215,7 +215,7 @@ jobs:
215215
run: |
216216
echo "${{ steps.tags.outputs.result }}"
217217
218-
- uses: actions/github-script@v6
218+
- uses: actions/github-script@v9
219219
id: normalized
220220
with:
221221
script: |
@@ -239,7 +239,7 @@ jobs:
239239
# Build and push Docker image with Buildx (don't push on PR)
240240
# https://github.com/docker/build-push-action
241241
- name: Build and push Docker image
242-
uses: docker/build-push-action@v5
242+
uses: docker/build-push-action@v7
243243
with:
244244
context: .
245245
file: deploy/docker/Dockerfile
@@ -271,7 +271,7 @@ jobs:
271271

272272
steps:
273273
- name: Checkout repository
274-
uses: actions/checkout@v4
274+
uses: actions/checkout@v7
275275

276276
- name: Install uv
277277
run: curl -LsSf https://astral.sh/uv/install.sh | sh
@@ -291,12 +291,12 @@ jobs:
291291
env:
292292
DOC_GITHUB_TOKEN: '${{ secrets.DOC_TOKEN }}'
293293
steps:
294-
- uses: actions/checkout@v4
294+
- uses: actions/checkout@v7
295295
if: startsWith(github.ref, 'refs/tags/')
296296
with:
297297
ref: master
298298

299-
- uses: actions/checkout@v4
299+
- uses: actions/checkout@v7
300300
if: github.ref == 'refs/heads/master'
301301

302302
- name: Get result

‎README.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
---
2+
sidebar_key: docker-easy-haproxy
3+
tags: [docker, devops]
4+
---
5+
16
# EasyHAProxy
27

38
[![Sponsor](https://img.shields.io/badge/Sponsor-%23ea4aaa?logo=githubsponsors&logoColor=white&labelColor=0d1117)](https://github.com/sponsors/byjg)

‎RELEASE.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ EasyHAProxy follows [Semantic Versioning](https://semver.org/):
5454
- **MINOR**: New features, plugin additions, backward-compatible changes
5555
- **PATCH**: Bug fixes, documentation updates, minor improvements
5656

57-
**Current Version:** `6.0.1` (as of Chart.yaml)
57+
**Current Version:** `6.1.0` (as of Chart.yaml)
5858

5959
## Automated Release (Recommended)
6060

@@ -329,6 +329,7 @@ helm show chart byjg/easyhaproxy
329329

330330
| Version | Release Date | Type | Highlights |
331331
|---------|--------------|-------|---------------------------------------------------------------------------------------------------------------------------------------|
332+
| 6.1.0 | 2026-06-24 | Minor | FastCGI protocol support, certbot sidecar plugin, dependency updates |
332333
| 6.0.1 | 2026-02-23 | Patch | HAProxy dashboard, real-time monitoring dashboard with live traffic charts, ACME e2e test fixes |
333334
| 6.0.0 | 2026-XX-XX | Major | Python module refactoring (one-class-per-file), IngressClassName support (spec.ingressClassName + deprecated annotation fallback), modernized build system (uv/pyproject.toml), improved version management and release tooling, GitHub Actions workflow_dispatch push control |
334335
| 5.0.0 | 2025-12-04 | Major | Plugin framework (builtin plugins: JWT, FastCGI, Cloudflare, IP whitelist, deny pages, cleanup), docs restructure, examples refreshed |

‎deploy/docker/docker-compose.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
services:
22
easyhaproxy:
3-
image: byjg/easy-haproxy:6.0.1
3+
image: byjg/easy-haproxy:6.1.0
44
volumes:
55
- /var/run/docker.sock:/var/run/docker.sock
66
- certs_certbot:/etc/easyhaproxy/certs/certbot

‎deploy/kubernetes/easyhaproxy-clusterip.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: ingress-easyhaproxy
77
namespace: easyhaproxy
88
labels:
9-
helm.sh/chart: easyhaproxy-2.0.2
9+
helm.sh/chart: easyhaproxy-2.0.3
1010
app.kubernetes.io/name: easyhaproxy
1111
app.kubernetes.io/instance: ingress
12-
app.kubernetes.io/version: "6.0.1"
12+
app.kubernetes.io/version: "6.1.0"
1313
app.kubernetes.io/managed-by: Helm
1414
---
1515
# Source: easyhaproxy/templates/clusterrole.yaml
@@ -19,10 +19,10 @@ metadata:
1919
name: ingress-easyhaproxy
2020
namespace: easyhaproxy
2121
labels:
22-
helm.sh/chart: easyhaproxy-2.0.2
22+
helm.sh/chart: easyhaproxy-2.0.3
2323
app.kubernetes.io/name: easyhaproxy
2424
app.kubernetes.io/instance: ingress
25-
app.kubernetes.io/version: "6.0.1"
25+
app.kubernetes.io/version: "6.1.0"
2626
app.kubernetes.io/managed-by: Helm
2727
rules:
2828
- apiGroups:
@@ -83,10 +83,10 @@ metadata:
8383
name: ingress-easyhaproxy
8484
namespace: easyhaproxy
8585
labels:
86-
helm.sh/chart: easyhaproxy-2.0.2
86+
helm.sh/chart: easyhaproxy-2.0.3
8787
app.kubernetes.io/name: easyhaproxy
8888
app.kubernetes.io/instance: ingress
89-
app.kubernetes.io/version: "6.0.1"
89+
app.kubernetes.io/version: "6.1.0"
9090
app.kubernetes.io/managed-by: Helm
9191
roleRef:
9292
apiGroup: rbac.authorization.k8s.io
@@ -105,10 +105,10 @@ metadata:
105105
name: ingress-easyhaproxy
106106
namespace: easyhaproxy
107107
labels:
108-
helm.sh/chart: easyhaproxy-2.0.2
108+
helm.sh/chart: easyhaproxy-2.0.3
109109
app.kubernetes.io/name: easyhaproxy
110110
app.kubernetes.io/instance: ingress
111-
app.kubernetes.io/version: "6.0.1"
111+
app.kubernetes.io/version: "6.1.0"
112112
app.kubernetes.io/managed-by: Helm
113113
annotations:
114114
{}
@@ -140,10 +140,10 @@ metadata:
140140
name: ingress-easyhaproxy
141141
namespace: easyhaproxy
142142
labels:
143-
helm.sh/chart: easyhaproxy-2.0.2
143+
helm.sh/chart: easyhaproxy-2.0.3
144144
app.kubernetes.io/name: easyhaproxy
145145
app.kubernetes.io/instance: ingress
146-
app.kubernetes.io/version: "6.0.1"
146+
app.kubernetes.io/version: "6.1.0"
147147
app.kubernetes.io/managed-by: Helm
148148
spec:
149149
replicas: 1
@@ -164,7 +164,7 @@ spec:
164164
- name: easyhaproxy
165165
securityContext:
166166
{}
167-
image: "byjg/easy-haproxy:6.0.1"
167+
image: "byjg/easy-haproxy:6.1.0"
168168
imagePullPolicy: Always
169169
ports:
170170
- name: http
@@ -217,10 +217,10 @@ kind: IngressClass
217217
metadata:
218218
name: easyhaproxy
219219
labels:
220-
helm.sh/chart: easyhaproxy-2.0.2
220+
helm.sh/chart: easyhaproxy-2.0.3
221221
app.kubernetes.io/name: easyhaproxy
222222
app.kubernetes.io/instance: ingress
223-
app.kubernetes.io/version: "6.0.1"
223+
app.kubernetes.io/version: "6.1.0"
224224
app.kubernetes.io/managed-by: Helm
225225
spec:
226226
controller: byjg.com/easyhaproxy

‎deploy/kubernetes/easyhaproxy-daemonset.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ metadata:
66
name: ingress-easyhaproxy
77
namespace: easyhaproxy
88
labels:
9-
helm.sh/chart: easyhaproxy-2.0.2
9+
helm.sh/chart: easyhaproxy-2.0.3
1010
app.kubernetes.io/name: easyhaproxy
1111
app.kubernetes.io/instance: ingress
12-
app.kubernetes.io/version: "6.0.1"
12+
app.kubernetes.io/version: "6.1.0"
1313
app.kubernetes.io/managed-by: Helm
1414
---
1515
# Source: easyhaproxy/templates/clusterrole.yaml
@@ -19,10 +19,10 @@ metadata:
1919
name: ingress-easyhaproxy
2020
namespace: easyhaproxy
2121
labels:
22-
helm.sh/chart: easyhaproxy-2.0.2
22+
helm.sh/chart: easyhaproxy-2.0.3
2323
app.kubernetes.io/name: easyhaproxy
2424
app.kubernetes.io/instance: ingress
25-
app.kubernetes.io/version: "6.0.1"
25+
app.kubernetes.io/version: "6.1.0"
2626
app.kubernetes.io/managed-by: Helm
2727
rules:
2828
- apiGroups:
@@ -83,10 +83,10 @@ metadata:
8383
name: ingress-easyhaproxy
8484
namespace: easyhaproxy
8585
labels:
86-
helm.sh/chart: easyhaproxy-2.0.2
86+
helm.sh/chart: easyhaproxy-2.0.3
8787
app.kubernetes.io/name: easyhaproxy
8888
app.kubernetes.io/instance: ingress
89-
app.kubernetes.io/version: "6.0.1"
89+
app.kubernetes.io/version: "6.1.0"
9090
app.kubernetes.io/managed-by: Helm
9191
roleRef:
9292
apiGroup: rbac.authorization.k8s.io
@@ -104,10 +104,10 @@ metadata:
104104
name: ingress-easyhaproxy
105105
namespace: easyhaproxy
106106
labels:
107-
helm.sh/chart: easyhaproxy-2.0.2
107+
helm.sh/chart: easyhaproxy-2.0.3
108108
app.kubernetes.io/name: easyhaproxy
109109
app.kubernetes.io/instance: ingress
110-
app.kubernetes.io/version: "6.0.1"
110+
app.kubernetes.io/version: "6.1.0"
111111
app.kubernetes.io/managed-by: Helm
112112
spec:
113113
selector:
@@ -136,7 +136,7 @@ spec:
136136
- name: easyhaproxy
137137
securityContext:
138138
{}
139-
image: "byjg/easy-haproxy:6.0.1"
139+
image: "byjg/easy-haproxy:6.1.0"
140140
imagePullPolicy: Always
141141
ports:
142142
- name: http
@@ -189,10 +189,10 @@ kind: IngressClass
189189
metadata:
190190
name: easyhaproxy
191191
labels:
192-
helm.sh/chart: easyhaproxy-2.0.2
192+
helm.sh/chart: easyhaproxy-2.0.3
193193
app.kubernetes.io/name: easyhaproxy
194194
app.kubernetes.io/instance: ingress
195-
app.kubernetes.io/version: "6.0.1"
195+
app.kubernetes.io/version: "6.1.0"
196196
app.kubernetes.io/managed-by: Helm
197197
spec:
198198
controller: byjg.com/easyhaproxy

0 commit comments

Comments
 (0)