From 89571eff5a7ab834cebe3b074db6943ca6412fe4 Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 12 Apr 2026 16:14:19 +0300 Subject: [PATCH 1/2] Fix #459: Add explicit `Caddyfile`s for dev and prod --- .dockerignore | 1 + CHANGELOG.md | 4 ++-- docker/Caddyfile | 19 +++++++++++++++++++ docker/Dockerfile | 3 +++ docker/dev/Caddyfile | 19 +++++++++++++++++++ 5 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 docker/Caddyfile create mode 100644 docker/dev/Caddyfile diff --git a/.dockerignore b/.dockerignore index 2734eb67..3192b281 100644 --- a/.dockerignore +++ b/.dockerignore @@ -3,6 +3,7 @@ # except: +!/docker/**/Caddyfile !/config !/public !/src diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d0e57ce..11048ca6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Yii3 Web Application Template Change Log -## 1.3.1 under development +## 1.4.0 under development -- no changes in this release. +- New #459: Add explicit `Caddyfile`s for dev and prod (@samdark) ## 1.3.0 April 06, 2026 diff --git a/docker/Caddyfile b/docker/Caddyfile new file mode 100644 index 00000000..d9124950 --- /dev/null +++ b/docker/Caddyfile @@ -0,0 +1,19 @@ +# Production mode config +# https://frankenphp.dev/docs/config +# https://caddyserver.com/docs/caddyfile + +{ + skip_install_trust + + frankenphp { + + } +} + +:80 { + encode zstd br gzip + php_server { + try_files {path} index.php + root /app/public + } +} diff --git a/docker/Dockerfile b/docker/Dockerfile index 67445c32..8527cb6f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -46,6 +46,8 @@ RUN \ chown -R ${USER_NAME}:${GROUP_NAME} /data/caddy && chown -R ${USER_NAME}:${GROUP_NAME} /config/caddy USER ${USER_NAME} +COPY docker/dev/Caddyfile /etc/frankenphp/Caddyfile + # # Production # @@ -59,5 +61,6 @@ RUN --mount=type=cache,target=/tmp/cache \ FROM base AS prod ENV APP_ENV=prod +COPY docker/Caddyfile /etc/frankenphp/Caddyfile COPY --from=prod-builder --chown=www-data:www-data /app /app USER www-data diff --git a/docker/dev/Caddyfile b/docker/dev/Caddyfile new file mode 100644 index 00000000..9b734526 --- /dev/null +++ b/docker/dev/Caddyfile @@ -0,0 +1,19 @@ +# Development mode config +# https://frankenphp.dev/docs/config +# https://caddyserver.com/docs/caddyfile + +{ + skip_install_trust + + frankenphp { + + } +} + +:80 { + encode zstd br gzip + php_server { + try_files {path} index.php + root /app/public + } +} From 379512ca8cbdc58216a1957bdafe7b02180f1d4e Mon Sep 17 00:00:00 2001 From: Alexander Makarov Date: Sun, 12 Apr 2026 16:30:08 +0300 Subject: [PATCH 2/2] Use spaces, pass $SERVER_NAME --- docker/Caddyfile | 18 +++++++++--------- docker/dev/Caddyfile | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/docker/Caddyfile b/docker/Caddyfile index d9124950..72d9a56b 100644 --- a/docker/Caddyfile +++ b/docker/Caddyfile @@ -3,17 +3,17 @@ # https://caddyserver.com/docs/caddyfile { - skip_install_trust + skip_install_trust - frankenphp { + frankenphp { - } + } } -:80 { - encode zstd br gzip - php_server { - try_files {path} index.php - root /app/public - } +{$SERVER_NAME::80} { + encode zstd br gzip + php_server { + try_files {path} index.php + root /app/public + } } diff --git a/docker/dev/Caddyfile b/docker/dev/Caddyfile index 9b734526..8885dfd6 100644 --- a/docker/dev/Caddyfile +++ b/docker/dev/Caddyfile @@ -3,17 +3,17 @@ # https://caddyserver.com/docs/caddyfile { - skip_install_trust + skip_install_trust - frankenphp { + frankenphp { - } + } } -:80 { - encode zstd br gzip - php_server { - try_files {path} index.php - root /app/public - } +{$SERVER_NAME::80} { + encode zstd br gzip + php_server { + try_files {path} index.php + root /app/public + } }