simpletest/who_need_help
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: build Caddy with patched grpc-go

Browse Source
This commit is contained in:
SimpleTest 2026-07-22 16:53:09 +03:00
parent 3a3ce39258
commit c32fd99c73
3 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Dockerfile.caddy
View File

@ -5,10 +5,17 @@ FROM golang:1.26.5-alpine3.23@sha256:622e56dbc11a8cfe87cafa2331e9a201877271cbff9
ENV CGO_ENABLED=0 ENV CGO_ENABLED=0
ENV GOTOOLCHAIN=local ENV GOTOOLCHAIN=local
RUN GOBIN=/out go install \ WORKDIR /src
-trimpath \
-ldflags="-s -w -X github.com/caddyserver/caddy/v2.CustomVersion=v2.11.4" \ RUN go mod init who-need-help/caddy-build \
github.com/caddyserver/caddy/v2/cmd/caddy@v2.11.4 && go get github.com/caddyserver/caddy/v2/cmd/caddy@v2.11.4 \
&& go get google.golang.org/grpc@v1.82.1 \
&& test "$(go list -m -f '{{.Version}}' google.golang.org/grpc)" = "v1.82.1" \
&& go build \
-trimpath \
-ldflags="-s -w -X github.com/caddyserver/caddy/v2.CustomVersion=v2.11.4-wnh-grpc1.82.1" \
-o /out/caddy \
github.com/caddyserver/caddy/v2/cmd/caddy
RUN mkdir -p /rootfs/data/caddy /rootfs/config/caddy /rootfs/tmp \ RUN mkdir -p /rootfs/data/caddy /rootfs/config/caddy /rootfs/tmp \
&& chown -R 1000:1000 /rootfs && chown -R 1000:1000 /rootfs

5
README.md
View File

@ -110,8 +110,9 @@ Compose starts Traefik, PostGIS, Mailpit, a migration runner, 2 web replicas,
and 2 Oban worker replicas. It waits for readiness and verifies a PubSub message and 2 Oban worker replicas. It waits for readiness and verifies a PubSub message
broadcast from a different BEAM node. Registration emails appear in Mailpit. broadcast from a different BEAM node. Registration emails appear in Mailpit.
The Traefik image is reproducibly built from the checksum-pinned upstream The Traefik image is reproducibly built from the checksum-pinned upstream
`v3.7.8` source with `grpc-go 1.82.1`, because the latest upstream binary still `v3.7.8` source with `grpc-go 1.82.1`. The Caddy edge is built from upstream
contains `grpc-go 1.81.1` affected by `v2.11.4` with the same dependency pin. Both latest upstream dependency graphs
still contain older `grpc-go` versions affected by
[GHSA-hrxh-6v49-42gf](https://github.com/advisories/GHSA-hrxh-6v49-42gf). [GHSA-hrxh-6v49-42gf](https://github.com/advisories/GHSA-hrxh-6v49-42gf).
Four deployment settings in the ignored environment select the runtime without Four deployment settings in the ignored environment select the runtime without

1
scripts/quality.sh
View File

@ -66,6 +66,7 @@ docker run --rm \
echo "Checking Dockerfiles with Hadolint 2.14.0" echo "Checking Dockerfiles with Hadolint 2.14.0"
for dockerfile in Dockerfile Dockerfile.backup Dockerfile.minio \ for dockerfile in Dockerfile Dockerfile.backup Dockerfile.minio \
Dockerfile.postgis Dockerfile.socket-proxy Dockerfile.traefik \ Dockerfile.postgis Dockerfile.socket-proxy Dockerfile.traefik \
Dockerfile.caddy \
android/Dockerfile e2e/Dockerfile ops/external-boundaries/Dockerfile; do android/Dockerfile e2e/Dockerfile ops/external-boundaries/Dockerfile; do
docker run --rm --interactive "$HADOLINT_IMAGE" \ docker run --rm --interactive "$HADOLINT_IMAGE" \
hadolint --failure-threshold warning - <"$dockerfile" hadolint --failure-threshold warning - <"$dockerfile"