From 0cb103e9e2e02f314110cab25260e45a7fa8c2da Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Thu, 24 Jul 2025 23:31:41 +0200 Subject: [PATCH 1/2] Fixes build command. --- dev-alpine.Dockerfile | 4 +++- dev.Dockerfile | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile index 0702b34805..77b776a09b 100644 --- a/dev-alpine.Dockerfile +++ b/dev-alpine.Dockerfile @@ -79,7 +79,9 @@ WORKDIR /go/src/app COPY . . WORKDIR /go/src/app/caddy/frankenphp -RUN go build +RUN export CGO_CFLAGS="$(php-config --includes)" && \ + export CGO_LDFLAGS="$(php-config --ldflags)" && \ + go build WORKDIR /go/src/app CMD [ "zsh" ] diff --git a/dev.Dockerfile b/dev.Dockerfile index fde91b0cdf..78757f3234 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -83,7 +83,9 @@ WORKDIR /go/src/app COPY --link . ./ WORKDIR /go/src/app/caddy/frankenphp -RUN ../../go.sh build -buildvcs=false +RUN export CGO_CFLAGS="$(php-config --includes)" && \ + export CGO_LDFLAGS="$(php-config --ldflags)" && \ + ../../go.sh build -buildvcs=false WORKDIR /go/src/app CMD [ "zsh" ] From 5e713820c34f46be7cb611f6abdae07f2ce24302 Mon Sep 17 00:00:00 2001 From: Alliballibaba Date: Sun, 27 Jul 2025 11:42:13 +0200 Subject: [PATCH 2/2] Rests ti go.sh --- dev-alpine.Dockerfile | 4 +--- dev.Dockerfile | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dev-alpine.Dockerfile b/dev-alpine.Dockerfile index 77b776a09b..63be2fb051 100644 --- a/dev-alpine.Dockerfile +++ b/dev-alpine.Dockerfile @@ -79,9 +79,7 @@ WORKDIR /go/src/app COPY . . WORKDIR /go/src/app/caddy/frankenphp -RUN export CGO_CFLAGS="$(php-config --includes)" && \ - export CGO_LDFLAGS="$(php-config --ldflags)" && \ - go build +RUN ../../go.sh build -buildvcs=false WORKDIR /go/src/app CMD [ "zsh" ] diff --git a/dev.Dockerfile b/dev.Dockerfile index 78757f3234..fde91b0cdf 100644 --- a/dev.Dockerfile +++ b/dev.Dockerfile @@ -83,9 +83,7 @@ WORKDIR /go/src/app COPY --link . ./ WORKDIR /go/src/app/caddy/frankenphp -RUN export CGO_CFLAGS="$(php-config --includes)" && \ - export CGO_LDFLAGS="$(php-config --ldflags)" && \ - ../../go.sh build -buildvcs=false +RUN ../../go.sh build -buildvcs=false WORKDIR /go/src/app CMD [ "zsh" ]