Merge branch 'fix/gotoolchain' of github.com:dunglas/frankenphp into fix/gotoolchain

Author: dunglas

Dockerfile

@@ -94,7 +94,7 @@ RUN curl -s https://api.github.com/repos/e-dant/watcher/releases/latest | \
 WORKDIR /go/src/app
 
 COPY --link go.mod go.sum ./
-RUN go download
+RUN go mod download
 
 WORKDIR /go/src/app/caddy
 COPY --link caddy/go.mod caddy/go.sum ./

caddy/caddy_test.go

@@ -55,37 +55,6 @@ func TestPHP(t *testing.T) {
 	wg.Wait()
 }
 
-func TestPHPSimplified(t *testing.T) {
-	var wg sync.WaitGroup
-	tester := caddytest.NewTester(t)
-	tester.InitServer(`
-		{
-			skip_install_trust
-			admin localhost:2999
-			http_port `+testPort+`
-			https_port 9443
-		}
-
-		localhost:`+testPort+` {
-			route {
-				php {
-					root ../testdata
-				}
-			}
-		}
-		`, "caddyfile")
-
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-
-		go func(i int) {
-			tester.AssertGetResponse(fmt.Sprintf("http://localhost:"+testPort+"/index.php?i=%d", i), http.StatusOK, fmt.Sprintf("I am by birth a Genevese (%d)", i))
-			wg.Done()
-		}(i)
-	}
-	wg.Wait()
-}
-
 func TestLargeRequest(t *testing.T) {
 	tester := caddytest.NewTester(t)
 	tester.InitServer(`

caddy/go.mod

@@ -1,6 +1,6 @@
 module github.com/dunglas/frankenphp/caddy
 
-go 1.24.0
+go 1.24
 
 replace github.com/dunglas/frankenphp => ../
 

dev-alpine.Dockerfile

@@ -3,7 +3,7 @@
 #checkov:skip=CKV_DOCKER_3
 FROM golang:1.24-alpine
 
-ENV GOTOOLCHAIN=lcoal
+ENV GOTOOLCHAIN=local
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS="\
 	autoconf \

dev.Dockerfile

@@ -3,7 +3,7 @@
 #checkov:skip=CKV_DOCKER_3
 FROM golang:1.24
 
-ENV GOTOOLCHAIN=lcoal
+ENV GOTOOLCHAIN=local
 ENV CFLAGS="-ggdb3"
 ENV PHPIZE_DEPS="\
 	autoconf \

static-builder-gnu.Dockerfile

@@ -22,7 +22,6 @@ ARG MIMALLOC=''
 ARG NO_COMPRESS=''
 
 # go version
-ENV GO_VERSION=1.24.2
 ENV GOTOOLCHAIN=local
 
 # labels, same as static-builder.Dockerfile
@@ -98,7 +97,7 @@ RUN yum install -y \
     curl -o jq -fsSL https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-${GO_ARCH} && \
     chmod +x jq && \
     mv jq /usr/local/bin/jq && \
-    curl -o go.tgz -fsSL https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
+    curl -LO https://get.golang.org/$(uname)/go_installer && chmod +x go_installer && ./go_installer && rm go_installer && \
     rm -rf /usr/local/go && \
     tar -C /usr/local -xzf go.tgz && \
     rm go.tgz && \