From ec5a0daddbf260ca212bc6db38a6cb202e953141 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Dunglas?= Date: Wed, 26 Mar 2025 16:48:10 +0100 Subject: [PATCH] feat: enabled workers in dev (watchers) --- Dockerfile | 5 +++-- compose.override.yaml | 1 + frankenphp/Caddyfile | 6 ++++++ frankenphp/worker.Caddyfile | 4 ---- 4 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 frankenphp/worker.Caddyfile diff --git a/Dockerfile b/Dockerfile index 8332832f9..4f0db6bbe 100644 --- a/Dockerfile +++ b/Dockerfile @@ -53,7 +53,9 @@ CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile" ] # Dev FrankenPHP image FROM frankenphp_base AS frankenphp_dev -ENV APP_ENV=dev XDEBUG_MODE=off +ENV APP_ENV=dev +ENV XDEBUG_MODE=off +ENV FRANKENPHP_WORKER_CONFIG=watch RUN mv "$PHP_INI_DIR/php.ini-development" "$PHP_INI_DIR/php.ini" @@ -70,7 +72,6 @@ CMD [ "frankenphp", "run", "--config", "/etc/caddy/Caddyfile", "--watch" ] FROM frankenphp_base AS frankenphp_prod ENV APP_ENV=prod -ENV FRANKENPHP_CONFIG="import worker.Caddyfile" RUN mv "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" diff --git a/compose.override.yaml b/compose.override.yaml index a3523e5c0..dc5c4104c 100644 --- a/compose.override.yaml +++ b/compose.override.yaml @@ -12,6 +12,7 @@ services: # from the bind-mount for better performance by enabling the next line: #- /app/vendor environment: + FRANKENPHP_WORKER_CONFIG: watch MERCURE_EXTRA_DIRECTIVES: demo # See https://xdebug.org/docs/all_settings#mode XDEBUG_MODE: "${XDEBUG_MODE:-off}" diff --git a/frankenphp/Caddyfile b/frankenphp/Caddyfile index b88136748..9f6d24c60 100644 --- a/frankenphp/Caddyfile +++ b/frankenphp/Caddyfile @@ -3,6 +3,12 @@ frankenphp { {$FRANKENPHP_CONFIG} + + worker { + file ./public/index.php + env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime + {$FRANKENPHP_WORKER_CONFIG} + } } } diff --git a/frankenphp/worker.Caddyfile b/frankenphp/worker.Caddyfile deleted file mode 100644 index d384ae4cd..000000000 --- a/frankenphp/worker.Caddyfile +++ /dev/null @@ -1,4 +0,0 @@ -worker { - file ./public/index.php - env APP_RUNTIME Runtime\FrankenPhpSymfony\Runtime -}