Skip to content

Commit da912e9

Browse files
committed
Merge branch 'fix/gotoolchain' of github.com:dunglas/frankenphp into fix/gotoolchain
2 parents e3b4662 + c768d9a commit da912e9

4 files changed

Lines changed: 3 additions & 34 deletions

File tree

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ RUN curl -s https://api.github.com/repos/e-dant/watcher/releases/latest | \
9494
WORKDIR /go/src/app
9595

9696
COPY --link go.mod go.sum ./
97-
RUN go download
97+
RUN go mod download
9898

9999
WORKDIR /go/src/app/caddy
100100
COPY --link caddy/go.mod caddy/go.sum ./

caddy/caddy_test.go

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -55,37 +55,6 @@ func TestPHP(t *testing.T) {
5555
wg.Wait()
5656
}
5757

58-
func TestPHPSimplified(t *testing.T) {
59-
var wg sync.WaitGroup
60-
tester := caddytest.NewTester(t)
61-
tester.InitServer(`
62-
{
63-
skip_install_trust
64-
admin localhost:2999
65-
http_port `+testPort+`
66-
https_port 9443
67-
}
68-
69-
localhost:`+testPort+` {
70-
route {
71-
php {
72-
root ../testdata
73-
}
74-
}
75-
}
76-
`, "caddyfile")
77-
78-
for i := 0; i < 100; i++ {
79-
wg.Add(1)
80-
81-
go func(i int) {
82-
tester.AssertGetResponse(fmt.Sprintf("http://localhost:"+testPort+"/index.php?i=%d", i), http.StatusOK, fmt.Sprintf("I am by birth a Genevese (%d)", i))
83-
wg.Done()
84-
}(i)
85-
}
86-
wg.Wait()
87-
}
88-
8958
func TestLargeRequest(t *testing.T) {
9059
tester := caddytest.NewTester(t)
9160
tester.InitServer(`

dev-alpine.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#checkov:skip=CKV_DOCKER_3
44
FROM golang:1.24-alpine
55

6-
ENV GOTOOLCHAIN=lcoal
6+
ENV GOTOOLCHAIN=local
77
ENV CFLAGS="-ggdb3"
88
ENV PHPIZE_DEPS="\
99
autoconf \

dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#checkov:skip=CKV_DOCKER_3
44
FROM golang:1.24
55

6-
ENV GOTOOLCHAIN=lcoal
6+
ENV GOTOOLCHAIN=local
77
ENV CFLAGS="-ggdb3"
88
ENV PHPIZE_DEPS="\
99
autoconf \

0 commit comments

Comments
 (0)