Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/sanitizers.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ on:
- "docs/**"
permissions:
contents: read
env:
GOTOOLCHAIN: local
jobs:
# Adapted from https://github.com/beberlei/hdrhistogram-php
sanitizers:
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/static.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ permissions:
attestations: write
env:
IMAGE_NAME: ${{ (github.event_name == 'schedule' || (github.event_name == 'workflow_dispatch' && inputs.version) || startsWith(github.ref, 'refs/tags/')) && 'dunglas/frankenphp' || 'dunglas/frankenphp-dev' }}
GOTOOLCHAIN: local
jobs:
prepare:
runs-on: ubuntu-24.04
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ on:
- "docs/**"
permissions:
contents: read
env:
GOTOOLCHAIN: local
jobs:
tests-linux:
name: Tests (Linux, PHP ${{ matrix.php-versions }})
Expand Down
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ SHELL ["/bin/bash", "-o", "pipefail", "-c"]
COPY --from=golang-base /usr/local/go /usr/local/go

ENV PATH=/usr/local/go/bin:$PATH
ENV GOTOOLCHAIN=local

# This is required to link the FrankenPHP binary to the PHP binary
RUN apt-get update && \
Expand Down
1 change: 1 addition & 0 deletions alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
COPY --link --from=golang-base /usr/local/go /usr/local/go

ENV PATH=/usr/local/go/bin:$PATH
ENV GOTOOLCHAIN=local

# hadolint ignore=SC2086
RUN apk add --no-cache --virtual .build-deps \
Expand Down
2 changes: 1 addition & 1 deletion caddy/caddy.go
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ func (f *FrankenPHPApp) UnmarshalCaddyfile(d *caddyfile.Dispenser) error {
}

if f.MaxThreads > 0 && f.NumThreads > 0 && f.MaxThreads < f.NumThreads {
return errors.New("'max_threads' must be greater than or equal to 'num_threads'")
return errors.New(`"max_threads"" must be greater than or equal to "num_threads"`)
}

return nil
Expand Down
2 changes: 0 additions & 2 deletions caddy/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ module github.com/dunglas/frankenphp/caddy

go 1.24.0

toolchain go1.24.2

replace github.com/dunglas/frankenphp => ../

retract v1.0.0-rc.1 // Human error
Expand Down
1 change: 1 addition & 0 deletions dev-alpine.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#checkov:skip=CKV_DOCKER_3
FROM golang:1.24-alpine

ENV GOTOOLCHAIN=local
ENV CFLAGS="-ggdb3"
ENV PHPIZE_DEPS="\
autoconf \
Expand Down
1 change: 1 addition & 0 deletions dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#checkov:skip=CKV_DOCKER_3
FROM golang:1.24

ENV GOTOOLCHAIN=local
ENV CFLAGS="-ggdb3"
ENV PHPIZE_DEPS="\
autoconf \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/dunglas/frankenphp

go 1.24
go 1.24.0

retract v1.0.0-rc.1 // Human error

Expand Down
11 changes: 6 additions & 5 deletions static-builder-gnu.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ ARG MIMALLOC=''
ARG NO_COMPRESS=''

# go version
ENV GO_VERSION=1.24.1
ENV GOTOOLCHAIN=local
ENV GO_VERSION=1.24.3

# labels, same as static-builder.Dockerfile
LABEL org.opencontainers.image.title=FrankenPHP
Expand Down Expand Up @@ -94,9 +95,8 @@ RUN yum install -y \
else \
GO_ARCH="amd64" ; \
fi ; \
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 /usr/local/bin/jq -fsSL https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux-${GO_ARCH} && \
chmod +x /usr/local/bin/jq && \
curl -o go.tgz -fsSL https://go.dev/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz && \
rm -rf /usr/local/go && \
tar -C /usr/local -xzf go.tgz && \
Expand All @@ -105,7 +105,7 @@ RUN yum install -y \

ENV PATH="/cmake/bin:/usr/local/go/bin:$PATH"

# Apply gnu mode
# Apply GNU mode
ENV CC='/opt/rh/devtoolset-10/root/usr/bin/gcc'
ENV CXX='/opt/rh/devtoolset-10/root/usr/bin/g++'
ENV AR='/opt/rh/devtoolset-10/root/usr/bin/ar'
Expand All @@ -127,6 +127,7 @@ RUN go mod download

WORKDIR /go/src/app/caddy
COPY caddy/go.mod caddy/go.sum ./
RUN go mod download

WORKDIR /go/src/app
COPY --link *.* ./
Expand Down
2 changes: 2 additions & 0 deletions static-builder-musl.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ ARG DEBUG_SYMBOLS=''
ARG MIMALLOC=''
ARG NO_COMPRESS=''

ENV GOTOOLCHAIN=local

SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

LABEL org.opencontainers.image.title=FrankenPHP
Expand Down