mirror of
https://github.com/php/frankenphp.git
synced 2026-03-24 00:52:11 +01:00
* Adds filesystem watcher with tests. * Refactoring. * Formatting. * Formatting. * Switches to absolute path in tests. * Fixes race condition from merge conflict. * Fixes race condition. * Fixes tests. * Fixes markdown lint errors. * Switches back to absolute paths. * Reverts back to relative file paths. * Fixes golangci-lint issues. * Uses github.com/dunglas/go-fswatch instead. * Stops watcher before stopping workers. * Updates docs. * Avoids segfault in tests. * Fixes watcher segmentation violations on shutdown. * Adjusts watcher latencies and tests. * Adds fswatch to dockerfiles * Fixes fswatch in alpine. * Fixes segfault (this time for real). * Allows queueing new reload if file changes while workers are reloading. * Makes tests more consistent. * Prevents the watcher from getting stuck if there is an error in the worker file itself. * Reverts changing the image. * Puts fswatch version into docker-bake.hcl. * Asserts instead of panicking. * Adds notice Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update dev.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update dev-alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update dev-alpine.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update dev.Dockerfile Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update docs/config.md Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Runs fswatch version. * Removes .json. * Replaces ms with s. * Resets the channel after closing it. * Update watcher_options.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update watcher_test.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Asserts no error instead. * Fixes a race condition where events are fired after frankenphp has stopped. * Updates docs. * Update watcher_options_test.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Allows queuing events while watchers are reloading. * go fmt * Refactors stopping and draining logic. * Allows extended watcher configuration with dirs, recursion, symlinks, case-sensitivity, latency, monitor types and regex. * Updates docs. * Adds TODOS. * go fmt. * Fixes linting errors. * Also allows wildcards in the longform and adjusts docs. * Adds debug log. * Fixes the watcher short form. * Refactors sessions and options into a struct. * Fixes an overflow in the 'workersReadyWG' on unexpected terminations. * Properly logs errors coming from session.Start(). * go fmt. * Adds --nocache. * Fixes lint issue. * Refactors and resolves race condition on worker reload. * Implements debouncing with a timer as suggested by @withinboredom. * Starts watcher even if no workers are defined. * Updates docs with file limit warning. * Adds watch config unit tests. * Adjusts debounce timings. * go fmt. * Adds fswatch to static builder (test). * Adds a short grace period between stopping and destroying the watcher sessions. * Adds caddy test. * Adjusts sleep time. * Swap to edant/watcher. * Fixes watch options and tests. * go fmt. * Adds TODO. * Installs edant/watcher in the bookworm image. * Fixes linting. * Refactors the watcher into its own module. * Adjusts naming. * ADocker image adjustments and refactoring. * Testing installation methods. * Installs via gcc instead. * Fixes pointer formats. * Fixes lint issues. * Fixes arm alpine and updates docs. * Clang format. * Fixes dirs. * Adds watcher version arg. * Uses static lib version. * Adds watcher to tests and sanitizers. * Uses sudo for copying the shared lib. * Removes unnused func. * Refactoring. * Update .github/workflows/sanitizers.yaml Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Adds fpic. * Fixes linting. * Skips tests in msan. * Resets op_cache in every worker thread after termination * Review fixes part 1. * Test: installing libstc++ instead of gcc. * Test: using msan ignorelist. * Test: using msan ignorelist. * Test: using msan ignorelist. * Allows '/**/' for global recursion and '**/' for relative recursion. * Reverts using the ignorelist. * Calls opcache directly. * Adds --watch to php-server command * Properly free CStrings. * Sorts alphabetically and uses curl instead of git. * Labeling and formatting. * Update .github/workflows/sanitizers.yaml Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update .github/workflows/sanitizers.yaml Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update .github/workflows/tests.yaml Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update .github/workflows/tests.yaml Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update caddy/caddy.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update docs/config.md Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update frankenphp_with_watcher_test.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update watcher/watcher.h Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update frankenphp.c Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update watcher/watcher.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update docs/config.md Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update frankenphp_with_watcher_test.go Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update testdata/files/.gitignore Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update watcher/watcher-c.h Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Update watcher/watcher.c Co-authored-by: Kévin Dunglas <kevin@dunglas.fr> * Fixes test and Dockerfile. * Fixes Dockerfiles. * Resets go versions. * Replaces unsafe.pointer with uintptr_t * Prevents worker channels from being destroyed on reload. * Minimizes the public api by only passing a []string. * Adds support for directory patterns and multiple '**' globs. * Adjusts label. * go fmt. * go mod tidy. * Fixes merge conflict. * Refactoring and formatting. * Cleans up unused vars and functions. * Allows dirs with a dot. * Makes test nicer. * Add dir tests. * Moves the watch directive inside the worker directive. * Adds debug log on special events. * Removes line about symlinks. * Hints at multiple possible --watch flags. * Adds ./**/*.php as default watch configuration. * Changes error to a warning. * Changes the default to './**/*.{php,yaml,yml,twig,env}' and supports the {bracket} pattern. * Fixes linting. * Fixes merge conflict and adjust values. * Adjusts values. --------- Co-authored-by: a.stecher <a.stecher@sportradar.com> Co-authored-by: Kévin Dunglas <kevin@dunglas.fr>
146 lines
4.3 KiB
Docker
146 lines
4.3 KiB
Docker
# syntax=docker/dockerfile:1
|
|
#checkov:skip=CKV_DOCKER_2
|
|
#checkov:skip=CKV_DOCKER_3
|
|
#checkov:skip=CKV_DOCKER_7
|
|
FROM php-base AS common
|
|
|
|
ARG TARGETARCH
|
|
|
|
WORKDIR /app
|
|
|
|
RUN apk add --no-cache \
|
|
ca-certificates \
|
|
libcap \
|
|
mailcap
|
|
|
|
RUN set -eux; \
|
|
mkdir -p \
|
|
/app/public \
|
|
/config/caddy \
|
|
/data/caddy \
|
|
/etc/caddy; \
|
|
sed -i 's/php/frankenphp run/g' /usr/local/bin/docker-php-entrypoint; \
|
|
echo '<?php phpinfo();' > /app/public/index.php
|
|
|
|
COPY --link caddy/frankenphp/Caddyfile /etc/caddy/Caddyfile
|
|
COPY --from=mlocati/php-extension-installer /usr/bin/install-php-extensions /usr/local/bin/
|
|
|
|
CMD ["--config", "/etc/caddy/Caddyfile", "--adapter", "caddyfile"]
|
|
HEALTHCHECK CMD curl -f http://localhost:2019/metrics || exit 1
|
|
|
|
# See https://caddyserver.com/docs/conventions#file-locations for details
|
|
ENV XDG_CONFIG_HOME=/config
|
|
ENV XDG_DATA_HOME=/data
|
|
|
|
EXPOSE 80
|
|
EXPOSE 443
|
|
EXPOSE 443/udp
|
|
EXPOSE 2019
|
|
|
|
LABEL org.opencontainers.image.title=FrankenPHP
|
|
LABEL org.opencontainers.image.description="The modern PHP app server"
|
|
LABEL org.opencontainers.image.url=https://frankenphp.dev
|
|
LABEL org.opencontainers.image.source=https://github.com/dunglas/frankenphp
|
|
LABEL org.opencontainers.image.licenses=MIT
|
|
LABEL org.opencontainers.image.vendor="Kévin Dunglas"
|
|
|
|
|
|
FROM common AS builder
|
|
|
|
ARG FRANKENPHP_VERSION='dev'
|
|
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
|
|
|
|
COPY --link --from=golang-base /usr/local/go /usr/local/go
|
|
|
|
ENV PATH=/usr/local/go/bin:$PATH
|
|
|
|
# hadolint ignore=SC2086
|
|
RUN apk add --no-cache --virtual .build-deps \
|
|
$PHPIZE_DEPS \
|
|
argon2-dev \
|
|
# Needed for the custom Go build
|
|
bash \
|
|
brotli-dev \
|
|
coreutils \
|
|
curl-dev \
|
|
# Needed for the custom Go build
|
|
git \
|
|
gnu-libiconv-dev \
|
|
libsodium-dev \
|
|
# Needed for the file watcher
|
|
libstdc++ \
|
|
libxml2-dev \
|
|
linux-headers \
|
|
oniguruma-dev \
|
|
openssl-dev \
|
|
readline-dev \
|
|
sqlite-dev \
|
|
upx
|
|
|
|
# FIXME: temporary workaround for https://github.com/golang/go/issues/68285
|
|
WORKDIR /
|
|
RUN git clone https://go.googlesource.com/go goroot
|
|
WORKDIR /goroot
|
|
# Revert https://github.com/golang/go/commit/3560cf0afb3c29300a6c88ccd98256949ca7a6f6 to prevent the crash with musl
|
|
RUN git config --global user.email "build@example.com" && \
|
|
git config --global user.name "Build" && \
|
|
git checkout "$(go env GOVERSION)" && \
|
|
git revert 3560cf0afb3c29300a6c88ccd98256949ca7a6f6
|
|
WORKDIR /goroot/src
|
|
ENV GOHOSTARCH="$TARGETARCH"
|
|
RUN ./make.bash
|
|
ENV PATH="/goroot/bin:$PATH"
|
|
RUN go version
|
|
|
|
WORKDIR /go/src/app
|
|
|
|
COPY --link go.mod go.sum ./
|
|
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
|
|
|
|
WORKDIR /go/src/app/caddy
|
|
COPY caddy/go.mod caddy/go.sum ./
|
|
RUN go mod graph | awk '{if ($1 !~ "@") print $2}' | xargs go get
|
|
|
|
WORKDIR /go/src/app
|
|
COPY --link *.* ./
|
|
COPY --link caddy caddy
|
|
COPY --link internal internal
|
|
COPY --link testdata testdata
|
|
COPY --link watcher watcher
|
|
|
|
# install edant/watcher (necessary for file watching)
|
|
ARG EDANT_WATCHER_VERSION=next
|
|
WORKDIR /usr/local/src/watcher
|
|
RUN curl -L https://github.com/e-dant/watcher/archive/refs/heads/$EDANT_WATCHER_VERSION.tar.gz | tar xz
|
|
WORKDIR /usr/local/src/watcher/watcher-$EDANT_WATCHER_VERSION/watcher-c
|
|
RUN gcc -o libwatcher.so ./src/watcher-c.cpp -I ./include -I ../include -std=c++17 -O3 -Wall -Wextra -fPIC -shared && \
|
|
cp libwatcher.so /usr/local/lib/libwatcher.so && \
|
|
ldconfig /usr/local/lib
|
|
|
|
# See https://github.com/docker-library/php/blob/master/8.3/alpine3.20/zts/Dockerfile#L53-L55
|
|
ENV CGO_CFLAGS="-DFRANKENPHP_VERSION=$FRANKENPHP_VERSION $PHP_CFLAGS"
|
|
ENV CGO_CPPFLAGS=$PHP_CPPFLAGS
|
|
ENV CGO_LDFLAGS="-lssl -lcrypto -lreadline -largon2 -lcurl -lonig -lz $PHP_LDFLAGS"
|
|
|
|
WORKDIR /go/src/app/caddy/frankenphp
|
|
RUN GOBIN=/usr/local/bin go install -ldflags "-w -s -extldflags '-Wl,-z,stack-size=0x80000' -X 'github.com/caddyserver/caddy/v2.CustomVersion=FrankenPHP $FRANKENPHP_VERSION PHP $PHP_VERSION Caddy'" && \
|
|
setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
|
|
upx --best /usr/local/bin/frankenphp && \
|
|
frankenphp version
|
|
|
|
WORKDIR /go/src/app
|
|
|
|
|
|
FROM common AS runner
|
|
|
|
ENV GODEBUG=cgocheck=0
|
|
|
|
# copy watcher shared library (libgcc and libstdc++ are needed for the watcher)
|
|
COPY --from=builder /usr/local/lib/libwatcher* /usr/local/lib/
|
|
RUN apk add --no-cache libstdc++ && \
|
|
ldconfig /usr/local/lib
|
|
|
|
COPY --from=builder /usr/local/bin/frankenphp /usr/local/bin/frankenphp
|
|
RUN setcap cap_net_bind_service=+ep /usr/local/bin/frankenphp && \
|
|
frankenphp version
|