mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-08-19 00:02:03 +00:00
Ruben Fiszel
770ac2be9e
The self-hosted Caddy image relied on the abandoned
RussellLuo/caddy-ext/layer4 shim to provide the `layer4` Caddyfile
global option, alongside an old (May 2024) pin of mholt/caddy-l4 that
predated native Caddyfile support. This combination is fragile:
- If the image is ever built without the RussellLuo shim, the `layer4`
global option disappears and Caddy fails with
"unrecognized global option: layer4" — the reported bug.
- Bumping mholt/caddy-l4 to any version with native Caddyfile support
makes both modules register `layer4`, panicking at startup with
"global option 'layer4' already registered".
mholt/caddy-l4 now natively registers the `layer4` global option, so
drop the RussellLuo dependency entirely and switch the Caddyfile to the
native `route { proxy { upstream ... } }` syntax. The adapted layer4
JSON is byte-identical to the previous output, so runtime behavior is
unchanged.
Also bump the Caddy base image to 2.11.4 (required by current
caddy-l4) and add a path-filtered push trigger so the published
`:latest` image is rebuilt whenever the Caddy Dockerfile changes,
instead of only on manual dispatch (which is how `:latest` drifted out
of sync with the checked-in Caddyfile in the first place).
Fixes GIT-903
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
13 lines
459 B
Plaintext
13 lines
459 B
Plaintext
FROM caddy:2.11.4-builder-alpine AS builder
|
|
|
|
# caddy-l4 natively registers the `layer4` global option used by the Caddyfile.
|
|
# Do NOT also add RussellLuo/caddy-ext/layer4: it registers the same global
|
|
# option, and building both panics with "global option 'layer4' already registered".
|
|
RUN xcaddy build \
|
|
--with github.com/mholt/caddy-l4@bd96009ea7373869bb07d61055554f966b1f5088
|
|
|
|
|
|
FROM caddy:2.11.4-alpine
|
|
|
|
COPY --from=builder /usr/bin/caddy /usr/bin/caddy
|