mirror of
https://github.com/dunglas/frankenphp
synced 2024-11-23 08:39:21 +00:00
8d9b6e755b
* 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>
152 lines
5.0 KiB
HCL
152 lines
5.0 KiB
HCL
variable "IMAGE_NAME" {
|
|
default = "dunglas/frankenphp"
|
|
}
|
|
|
|
variable "VERSION" {
|
|
default = "dev"
|
|
}
|
|
|
|
variable "PHP_VERSION" {
|
|
default = "8.2,8.3"
|
|
}
|
|
|
|
variable "GO_VERSION" {
|
|
default = "1.22"
|
|
}
|
|
|
|
variable EDANT_WATCHER_VERSION {
|
|
default = "next"
|
|
}
|
|
|
|
variable "SHA" {}
|
|
|
|
variable "LATEST" {
|
|
default = true
|
|
}
|
|
|
|
variable "CACHE" {
|
|
default = ""
|
|
}
|
|
|
|
variable DEFAULT_PHP_VERSION {
|
|
default = "8.3"
|
|
}
|
|
|
|
function "tag" {
|
|
params = [version, os, php-version, tgt]
|
|
result = [
|
|
version == "" ? "" : "${IMAGE_NAME}:${trimprefix("${version}${tgt == "builder" ? "-builder" : ""}-php${php-version}-${os}", "latest-")}",
|
|
php-version == DEFAULT_PHP_VERSION && os == "bookworm" && version != "" ? "${IMAGE_NAME}:${trimprefix("${version}${tgt == "builder" ? "-builder" : ""}", "latest-")}" : "",
|
|
php-version == DEFAULT_PHP_VERSION && version != "" ? "${IMAGE_NAME}:${trimprefix("${version}${tgt == "builder" ? "-builder" : ""}-${os}", "latest-")}" : "",
|
|
os == "bookworm" && version != "" ? "${IMAGE_NAME}:${trimprefix("${version}${tgt == "builder" ? "-builder" : ""}-php${php-version}", "latest-")}" : "",
|
|
]
|
|
}
|
|
|
|
# cleanTag ensures that the tag is a valid Docker tag
|
|
# cleanTag ensures that the tag is a valid Docker tag
|
|
# see https://github.com/distribution/distribution/blob/v2.8.2/reference/regexp.go#L37
|
|
function "clean_tag" {
|
|
params = [tag]
|
|
result = substr(regex_replace(regex_replace(tag, "[^\\w.-]", "-"), "^([^\\w])", "r$0"), 0, 127)
|
|
}
|
|
|
|
# semver adds semver-compliant tag if a semver version number is passed, or returns the revision itself
|
|
# see https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
|
|
function "semver" {
|
|
params = [rev]
|
|
result = __semver(_semver(regexall("^v?(?P<major>0|[1-9]\\d*)\\.(?P<minor>0|[1-9]\\d*)\\.(?P<patch>0|[1-9]\\d*)(?:-(?P<prerelease>(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\\.(?:0|[1-9]\\d*|\\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\\+(?P<buildmetadata>[0-9a-zA-Z-]+(?:\\.[0-9a-zA-Z-]+)*))?$", rev)))
|
|
}
|
|
|
|
function "_semver" {
|
|
params = [matches]
|
|
result = length(matches) == 0 ? {} : matches[0]
|
|
}
|
|
|
|
function "__semver" {
|
|
params = [v]
|
|
result = v == {} ? [clean_tag(VERSION)] : v.prerelease == null ? [v.major, "${v.major}.${v.minor}", "${v.major}.${v.minor}.${v.patch}"] : ["${v.major}.${v.minor}.${v.patch}-${v.prerelease}"]
|
|
}
|
|
|
|
function "php_version" {
|
|
params = [v]
|
|
result = _php_version(v, regexall("(?P<major>\\d+)\\.(?P<minor>\\d+)", v)[0])
|
|
}
|
|
|
|
function "_php_version" {
|
|
params = [v, m]
|
|
result = "${m.major}.${m.minor}" == DEFAULT_PHP_VERSION ? [v, "${m.major}.${m.minor}", "${m.major}"] : [v, "${m.major}.${m.minor}"]
|
|
}
|
|
|
|
target "default" {
|
|
name = "${tgt}-php-${replace(php-version, ".", "-")}-${os}"
|
|
matrix = {
|
|
os = ["bookworm", "alpine"]
|
|
php-version = split(",", PHP_VERSION)
|
|
tgt = ["builder", "runner"]
|
|
}
|
|
contexts = {
|
|
php-base = "docker-image://php:${php-version}-zts-${os}"
|
|
golang-base = "docker-image://golang:${GO_VERSION}-${os}"
|
|
}
|
|
dockerfile = os == "alpine" ? "alpine.Dockerfile" : "Dockerfile"
|
|
context = "./"
|
|
target = tgt
|
|
# arm/v6 is only available for Alpine: https://github.com/docker-library/golang/issues/502
|
|
platforms = os == "alpine" ? [
|
|
"linux/amd64",
|
|
"linux/386",
|
|
# FIXME: armv6 doesn't build in GitHub actions because we use a custom Go build
|
|
#"linux/arm/v6",
|
|
"linux/arm/v7",
|
|
"linux/arm64",
|
|
] : [
|
|
"linux/amd64",
|
|
"linux/386",
|
|
"linux/arm/v7",
|
|
"linux/arm64"
|
|
]
|
|
tags = distinct(flatten(
|
|
[for pv in php_version(php-version) : flatten([
|
|
LATEST ? tag("latest", os, pv, tgt) : [],
|
|
tag(SHA == "" || VERSION != "dev" ? "" : "sha-${substr(SHA, 0, 7)}", os, pv, tgt),
|
|
VERSION == "dev" ? [] : [for v in semver(VERSION) : tag(v, os, pv, tgt)]
|
|
])
|
|
]))
|
|
labels = {
|
|
"org.opencontainers.image.created" = "${timestamp()}"
|
|
"org.opencontainers.image.version" = VERSION
|
|
"org.opencontainers.image.revision" = SHA
|
|
}
|
|
args = {
|
|
FRANKENPHP_VERSION = VERSION
|
|
EDANT_WATCHER_VERSION = EDANT_WATCHER_VERSION
|
|
}
|
|
}
|
|
|
|
target "static-builder" {
|
|
contexts = {
|
|
golang-base = "docker-image://golang:${GO_VERSION}-alpine"
|
|
}
|
|
dockerfile = "static-builder.Dockerfile"
|
|
context = "./"
|
|
platforms = [
|
|
"linux/amd64",
|
|
"linux/arm64",
|
|
]
|
|
tags = distinct(flatten([
|
|
LATEST ? "${IMAGE_NAME}:static-builder" : "",
|
|
SHA == "" || VERSION != "dev" ? "" : "${IMAGE_NAME}:static-builder-sha-${substr(SHA, 0, 7)}",
|
|
VERSION == "dev" ? [] : [for v in semver(VERSION) : "${IMAGE_NAME}:static-builder-${v}"]
|
|
]))
|
|
labels = {
|
|
"org.opencontainers.image.created" = "${timestamp()}"
|
|
"org.opencontainers.image.version" = VERSION
|
|
"org.opencontainers.image.revision" = SHA
|
|
}
|
|
args = {
|
|
FRANKENPHP_VERSION = VERSION
|
|
EDANT_WATCHER_VERSION = EDANT_WATCHER_VERSION
|
|
}
|
|
secret = ["id=github-token,env=GITHUB_TOKEN"]
|
|
}
|