Skip to content

Commit bfe535d

Browse files
authored
Merge pull request #816 from Wikid82/hotfix/docker_build
fix(docker): update CADDY_VERSION to 2.11.2 for improved stability
2 parents 36d561b + aaf5247 commit bfe535d

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/instructions/ARCHITECTURE.instructions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ graph TB
126126
| **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling |
127127
| **Database** | SQLite | 3.x | Embedded database |
128128
| **ORM** | GORM | Latest | Database abstraction layer |
129-
| **Reverse Proxy** | Caddy Server | 2.11.1 | Embedded HTTP/HTTPS proxy |
129+
| **Reverse Proxy** | Caddy Server | 2.11.2 | Embedded HTTP/HTTPS proxy |
130130
| **WebSocket** | gorilla/websocket | Latest | Real-time log streaming |
131131
| **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption |
132132
| **Metrics** | Prometheus Client | Latest | Application metrics |

.vscode/tasks.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,7 @@
727727
{
728728
"label": "Security: Caddy PR-1 Compatibility Matrix",
729729
"type": "shell",
730-
"command": "cd /projects/Charon && bash scripts/caddy-compat-matrix.sh --candidate-version 2.11.1 --patch-scenarios A,B,C --platforms linux/amd64,linux/arm64 --smoke-set boot_caddy,plugin_modules,config_validate,admin_api_health --output-dir test-results/caddy-compat --docs-report docs/reports/caddy-compatibility-matrix.md",
730+
"command": "cd /projects/Charon && bash scripts/caddy-compat-matrix.sh --candidate-version 2.11.2 --patch-scenarios A,B,C --platforms linux/amd64,linux/arm64 --smoke-set boot_caddy,plugin_modules,config_validate,admin_api_health --output-dir test-results/caddy-compat --docs-report docs/reports/caddy-compatibility-matrix.md",
731731
"group": "test",
732732
"problemMatcher": []
733733
},

ARCHITECTURE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ graph TB
126126
| **HTTP Framework** | Gin | Latest | Routing, middleware, HTTP handling |
127127
| **Database** | SQLite | 3.x | Embedded database |
128128
| **ORM** | GORM | Latest | Database abstraction layer |
129-
| **Reverse Proxy** | Caddy Server | 2.11.1 | Embedded HTTP/HTTPS proxy |
129+
| **Reverse Proxy** | Caddy Server | 2.11.2 | Embedded HTTP/HTTPS proxy |
130130
| **WebSocket** | gorilla/websocket | Latest | Real-time log streaming |
131131
| **Crypto** | golang.org/x/crypto | Latest | Password hashing, encryption |
132132
| **Metrics** | Prometheus Client | Latest | Application metrics |

Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ ARG BUILD_DEBUG=0
1414
# avoid accidentally pulling a v3 major release. Renovate can still update
1515
# this ARG to a specific v2.x tag when desired.
1616
## Try to build the requested Caddy v2.x tag (Renovate can update this ARG).
17-
## If the requested tag isn't available, fall back to a known-good v2.11.1 build.
18-
ARG CADDY_VERSION=2.11.1
19-
ARG CADDY_CANDIDATE_VERSION=2.11.1
17+
## If the requested tag isn't available, fall back to a known-good v2.11.2 build.
18+
ARG CADDY_VERSION=2.11.2
19+
ARG CADDY_CANDIDATE_VERSION=2.11.2
2020
ARG CADDY_USE_CANDIDATE=0
2121
ARG CADDY_PATCH_SCENARIO=B
2222
# renovate: datasource=go depName=github.com/greenpau/caddy-security

docs/reports/caddy-compatibility-matrix.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# PR-1 Caddy Compatibility Matrix Report
22

33
- Generated at: 2026-02-23T13:52:26Z
4-
- Candidate Caddy version: 2.11.1
4+
- Candidate Caddy version: 2.11.2
55
- Plugin set: caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit
66
- Smoke set: boot_caddy,plugin_modules,config_validate,admin_api_health
77
- Matrix dimensions: patch scenario × platform/arch × checked plugin modules

docs/reports/caddy-security-posture.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
- Date: 2026-02-23
44
- Scope: PR-2 only (security patch posture + xcaddy patch retirement decision)
5-
- Upstream target: Caddy 2.11.x line (`2.11.1` candidate in this repository)
5+
- Upstream target: Caddy 2.11.x line (`2.11.2` candidate in this repository)
66
- Inputs:
77
- PR-1 compatibility matrix: `docs/reports/caddy-compatibility-matrix.md`
88
- Plan authority: `docs/plans/current_spec.md`

scripts/caddy-compat-matrix.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
readonly DEFAULT_CANDIDATE_VERSION="2.11.1"
5+
readonly DEFAULT_CANDIDATE_VERSION="2.11.2"
66
readonly DEFAULT_PATCH_SCENARIOS="A,B,C"
77
readonly DEFAULT_PLATFORMS="linux/amd64,linux/arm64"
88
readonly DEFAULT_PLUGIN_SET="caddy-security,coraza-caddy,caddy-crowdsec-bouncer,caddy-geoip2,caddy-ratelimit"
@@ -33,7 +33,7 @@ Usage: scripts/caddy-compat-matrix.sh [options]
3333
Options:
3434
--output-dir <path> Output directory (default: test-results/caddy-compat)
3535
--docs-report <path> Markdown report path (default: docs/reports/caddy-compatibility-matrix.md)
36-
--candidate-version <ver> Candidate Caddy version (default: 2.11.1)
36+
--candidate-version <ver> Candidate Caddy version (default: 2.11.2)
3737
--patch-scenarios <csv> Patch scenarios CSV (default: A,B,C)
3838
--platforms <csv> Platforms CSV (default: linux/amd64,linux/arm64)
3939
--plugin-set <csv> Plugin set descriptor for report metadata

0 commit comments

Comments
 (0)