*Default: "/healthcheck"*|Set the path for the health check endpoint. (Official docs)|all (except `cli` and `frankenphp`) `HEALTHCHECK_SSL_CERTIFICATE_FILE`
*Default: "/etc/ssl/healthcheck/localhost.crt"*|Set the path to the SSL certificate for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp `HEALTHCHECK_SSL_PRIVATE_KEY_FILE`
*Default: "/etc/ssl/healthcheck/localhost.key"*|Set the path to the SSL private key for the health check endpoint.| fpm-apache, fpm-nginx, frankenphp -`LOG_OUTPUT_LEVEL`
*Default:*
*"warn" (for all)*
*"info" (for frankenphp)*|Set your container output different verbosity levels: debug, warn, info, off |all +`LOG_OUTPUT_LEVEL`
*Default:*
*"warn" (for all)*
*"info" (for frankenphp)*|Set the verbosity level for container output and service logs. Valid values (least to most verbose): `emerg`, `alert`, `crit`, `error`, `warn`, `notice`, `info`, `debug`. Each level is translated to the native log configuration for PHP, PHP-FPM, and the active web server.
âšī¸ FrankenPHP defaults to `info` because Caddy unifies access and error logs â setting `warn` would suppress HTTP request logs entirely (unlike Apache/NGINX where access logs are a separate directive).|all `NGINX_ACCESS_LOG`
*Default: "/dev/stdout"*|Set the default output stream for access log.|fpm-nginx `NGINX_ERROR_LOG`
*Default: "/dev/stderr"*|Set the default output stream for error log.|fpm-nginx `NGINX_FASTCGI_BUFFERS`
*Default: "8 8k"*|Sets the number and size of the buffers used for reading a response from a FastCGI server. (Official Docs)|fpm-nginx diff --git a/src/common/etc/entrypoint.d/0-container-info.sh b/src/common/etc/entrypoint.d/0-container-info.sh index b92ee2bdb..7ef26e334 100644 --- a/src/common/etc/entrypoint.d/0-container-info.sh +++ b/src/common/etc/entrypoint.d/0-container-info.sh @@ -1,7 +1,7 @@ #!/bin/sh -if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$LOG_OUTPUT_LEVEL" = "off" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then +if [ "$SHOW_WELCOME_MESSAGE" = "false" ] || [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then - echo "đ $0: Container info was display was skipped." + echo "đ $0: Container info display was skipped." fi # Skip the rest of the script exit 0 diff --git a/src/common/usr/local/bin/docker-php-serversideup-entrypoint b/src/common/usr/local/bin/docker-php-serversideup-entrypoint index 03546fc98..8dd38045c 100644 --- a/src/common/usr/local/bin/docker-php-serversideup-entrypoint +++ b/src/common/usr/local/bin/docker-php-serversideup-entrypoint @@ -13,7 +13,7 @@ fi # Check if the default command is being used case "$1" in - "/init" | "php-fpm") + "/init" | "php-fpm" | "frankenphp") SERVERSIDEUP_DEFAULT_COMMAND="true" ;; esac diff --git a/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh b/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh index 82c28d374..2b7dc5fe7 100644 --- a/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh +++ b/src/utilities-webservers/etc/entrypoint.d/5-generate-ssl.sh @@ -9,6 +9,13 @@ if [ "$DISABLE_DEFAULT_CONFIG" = "true" ]; then exit 0 fi +if [ "$SERVERSIDEUP_DEFAULT_COMMAND" != "true" ]; then + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SERVERSIDEUP_DEFAULT_COMMAND is not true, so we won't generate a self-signed SSL key pair." + fi + exit 0 +fi + SSL_CERTIFICATE_FILE=${SSL_CERTIFICATE_FILE:-"/etc/ssl/private/self-signed-web.crt"} SSL_PRIVATE_KEY_FILE=${SSL_PRIVATE_KEY_FILE:-"/etc/ssl/private/self-signed-web.key"} SSL_MODE=${SSL_MODE:-"off"} @@ -16,7 +23,9 @@ HEALTHCHECK_SSL_CERTIFICATE_FILE=${HEALTHCHECK_SSL_CERTIFICATE_FILE:-"/etc/ssl/h HEALTHCHECK_SSL_PRIVATE_KEY_FILE=${HEALTHCHECK_SSL_PRIVATE_KEY_FILE:-"/etc/ssl/healthcheck/localhost.key"} if [ "$SSL_MODE" = "off" ]; then - echo "âšī¸ NOTICE ($script_name): SSL mode is off, so we won't generate a self-signed SSL key pair." + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SSL mode is off, so we won't generate a self-signed SSL key pair." + fi return 0 fi @@ -45,7 +54,9 @@ if [ -d "/etc/frankenphp/" ]; then fi if [ -f "$SSL_CERTIFICATE_FILE" ] && [ -f "$SSL_PRIVATE_KEY_FILE" ]; then - echo "âšī¸ NOTICE ($script_name): SSL certificate and private key already exist, so we'll use the existing files." + if [ "$LOG_OUTPUT_LEVEL" = "debug" ]; then + echo "đ $script_name: SSL certificate and private key already exist, so we'll use the existing files." + fi return 0 fi diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile index 0d972084b..bdb49c0ea 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/debug.caddyfile @@ -1,5 +1,5 @@ log { format {$CADDY_LOG_FORMAT:console} output {$CADDY_LOG_OUTPUT:stdout} - level {$CADDY_SERVER_LOG_LEVEL:INFO} + level {$CADDY_SERVER_LOG_LEVEL:DEBUG} } From a7fb85ef075ebb97c3b9bf226567896c19681ae6 Mon Sep 17 00:00:00 2001 From: Jay Rogers
'
@@ -27,7 +27,7 @@ jobs:
with:
organization: true
maximum: 500
- fallback: '
'
diff --git a/README.md b/README.md
index bc350c7aa..2d4e819f1 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
-
+
#### Bronze Sponsors
-No bronze sponsors yet. Become a sponsor â
+No bronze sponsors yet. Become a sponsor â
#### Infrastructure Sponsors
This project requires significant computing power to build and maintain over 8,000 different Docker image tags. We're extremely grateful for the following sponsors:
@@ -176,7 +176,7 @@ We're [Dan](https://x.com/danpastori) and [Jay](https://x.com/jaydrogers) - a tw
* **đģ [GitHub](https://github.com/serversideup)** - Check out our other open source projects.
* **đĢ [Newsletter](https://serversideup.net/subscribe)** - Skip the algorithms and get quality content right to your inbox.
* **đĨ [Twitter](https://x.com/serversideup)** - You can also follow [Dan](https://x.com/danpastori) and [Jay](https://x.com/jaydrogers).
-* **â¤ī¸ [Sponsor Us](https://github.com/sponsors/serversideup)** - Please consider sponsoring us so we can create more helpful resources.
+* **â¤ī¸ [Sponsor Us](https://serversideup.net/sponsor/)** - Please consider sponsoring us so we can create more helpful resources.
## Our Products
If you appreciate this project, be sure to check out our other projects.
diff --git a/docs/app/app.config.ts b/docs/app/app.config.ts
index 8fe6a9bb7..4646d4997 100644
--- a/docs/app/app.config.ts
+++ b/docs/app/app.config.ts
@@ -116,7 +116,7 @@ export default defineAppConfig({
},{
'trailingIcon': 'i-lucide-heart',
'label': 'Sponsor',
- 'to': 'https://github.com/sponsors/serversideup',
+ 'to': 'https://serversideup.net/sponsor/',
'target': '_blank',
'aria-label': 'Sponsor',
'size': 'xl',
diff --git a/docs/app/components/Badges.vue b/docs/app/components/Badges.vue
index 498535522..6cc6c1aac 100644
--- a/docs/app/components/Badges.vue
+++ b/docs/app/components/Badges.vue
@@ -3,6 +3,6 @@
- 
- *Default: "false"*|Skip the database connection check before running migrations.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_MIGRATION_TIMEOUT`
*Default: "30"*|The number of seconds to wait for the database to come online before attempting `php artisan migrate`..
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_ROUTE_CACHE`
*Default: "true"*|Automatically run "php artisan route:cache" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all +`AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND`
*Default: "false"*|When set to `true`, the Laravel Automations script will exit gracefully (without error) if Laravel is not detected in `APP_BASE_DIR`, instead of failing the container. Useful when `AUTORUN_ENABLED=true` is set on a shared image where Laravel may not always be present (e.g. before the first `composer install`).
âšī¸ Requires `AUTORUN_ENABLED = true` to have any effect.| all `AUTORUN_LARAVEL_STORAGE_LINK`
*Default: "true"*|Automatically run "php artisan storage:link" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_VIEW_CACHE`
*Default: "true"*|Automatically run "php artisan view:cache" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `CADDY_ADMIN`
*Default: "off"*|Enable Caddy admin interface. (Official docs)|frankenphp diff --git a/src/common/etc/entrypoint.d/50-laravel-automations.sh b/src/common/etc/entrypoint.d/50-laravel-automations.sh index 3634c0a12..857f76fab 100644 --- a/src/common/etc/entrypoint.d/50-laravel-automations.sh +++ b/src/common/etc/entrypoint.d/50-laravel-automations.sh @@ -9,6 +9,7 @@ script_name="laravel-automations" # Set default values for Laravel automations : "${AUTORUN_ENABLED:=false}" : "${AUTORUN_DEBUG:=false}" +: "${AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND:=false}" # Set default values for storage link : "${AUTORUN_LARAVEL_STORAGE_LINK:=true}" @@ -469,6 +470,10 @@ if laravel_is_installed; then artisan_optimize fi else + if [ "$AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND" = "true" ]; then + debug_log "Laravel not detected in $APP_BASE_DIR. Skipping automations (AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND=true)." + exit 0 + fi echo "â $script_name: Could not detect Laravel installation." echo "âšī¸ Check that the application is installed in $APP_BASE_DIR" exit 1 From a9f3c6c3ef045b476690bfac59fc4853abcb65e7 Mon Sep 17 00:00:00 2001 From: Jay Rogers
*Default: "off"* | `shortlived` | Select a Let's Encrypt certificate profile. Also accepts `tlsserver` and `classic`. | + +::warning +Enabling a profile configures Caddy's `cert_issuer`, which pins issuance to **Let's Encrypt only** (the default ZeroSSL fallback is dropped). Short-lived certificates also renew roughly every 2 days, so the container needs reliable egress to the ACME CA. Leave it `off` unless you specifically want this behavior. +:: + +**Raw-IP / SNI-less access:** clients connecting by IP address send no SNI, so Caddy needs a [`default_sni`](https://caddyserver.com/docs/caddyfile/options#default-sni){target="_blank"} to know which certificate to serve. There's no dedicated variable for this because the value is your own domain/IP â set it through `CADDY_GLOBAL_OPTIONS`: + +```yml +environment: + CADDY_AUTO_HTTPS: "on" + CADDY_ACME_PROFILE: "shortlived" + # Fallback identity for connections that send no SNI (e.g. by IP). + # Reference your own variable if you like: "default_sni {$APP_DOMAIN}" + CADDY_GLOBAL_OPTIONS: "default_sni example.com" +``` + ### Bringing Your Own Certificate If automatic HTTPS isn't an option, you can provide your own certificate from a vendor like [ssls.com](https://www.ssls.com/){target="_blank"}. Ensure your certificate issuer provides certificates compatible with your web server in [PEM format](https://en.wikipedia.org/wiki/Privacy-Enhanced_Mail){target="_blank"}. diff --git a/docs/content/docs/8.reference/1.environment-variable-specification.md b/docs/content/docs/8.reference/1.environment-variable-specification.md index 279f97d72..73cd102c4 100644 --- a/docs/content/docs/8.reference/1.environment-variable-specification.md +++ b/docs/content/docs/8.reference/1.environment-variable-specification.md @@ -45,6 +45,7 @@ Setting environment variables all depends on what method you're using to run you `AUTORUN_LARAVEL_SKIP_IF_NOT_FOUND`
*Default: "false"*|When set to `true`, the Laravel Automations script will exit gracefully (without error) if Laravel is not detected in `APP_BASE_DIR`, instead of failing the container. Useful when `AUTORUN_ENABLED=true` is set on a shared image where Laravel may not always be present (e.g. before the first `composer install`).
âšī¸ Requires `AUTORUN_ENABLED = true` to have any effect.| all `AUTORUN_LARAVEL_STORAGE_LINK`
*Default: "true"*|Automatically run "php artisan storage:link" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all `AUTORUN_LARAVEL_VIEW_CACHE`
*Default: "true"*|Automatically run "php artisan view:cache" on container start.
âšī¸ Requires `AUTORUN_ENABLED = true` to run.| all +`CADDY_ACME_PROFILE`
*Default: "off"*|Select a Let's Encrypt ACME certificate profile. Valid options: `off` (default, no profile â keeps the stock Let's Encrypt + ZeroSSL issuers), `shortlived` (~6-day certs; also required for IP-address certificates), `tlsserver`, or `classic`. Setting any profile pins issuance to Let's Encrypt only and renews more frequently, so the container needs reliable egress to the ACME CA. (Official docs)|frankenphp `CADDY_ADMIN`
*Default: "off"*|Enable Caddy admin interface. (Official docs)|frankenphp `CADDY_AUTO_HTTPS`
*Default: "off"*|Enable automatic HTTPS. (Official docs)|frankenphp `CADDY_GLOBAL_OPTIONS`
*Default: ""*|Set global options for the Caddy server. (Official docs)|frankenphp diff --git a/src/variations/frankenphp/Dockerfile b/src/variations/frankenphp/Dockerfile index d88b8a9cd..0cd377a6a 100644 --- a/src/variations/frankenphp/Dockerfile +++ b/src/variations/frankenphp/Dockerfile @@ -127,6 +127,7 @@ LABEL org.opencontainers.image.title="serversideup/php (frankenphp)" \ org.opencontainers.image.licenses="GPL-3.0-or-later" ENV APP_BASE_DIR=/var/www/html \ + CADDY_ACME_PROFILE="off" \ CADDY_ADMIN="off" \ CADDY_AUTO_HTTPS="off" \ CADDY_GLOBAL_OPTIONS="" \ diff --git a/src/variations/frankenphp/etc/frankenphp/Caddyfile b/src/variations/frankenphp/etc/frankenphp/Caddyfile index cc883e8e1..704cee3dd 100644 --- a/src/variations/frankenphp/etc/frankenphp/Caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/Caddyfile @@ -19,8 +19,11 @@ import trusted-proxy/{$TRUSTED_PROXY:cloudflare}.caddyfile + # Select a Let's Encrypt ACME certificate profile (default: off) + import acme-profile/{$CADDY_ACME_PROFILE:off}.caddyfile + # Add additional Caddy configuration files from the caddyfile-global.d directory - import caddyfile-global.d/*.caddyfile + import caddyfile-global.d/*.caddyfile {$CADDY_GLOBAL_OPTIONS} } diff --git a/src/variations/frankenphp/etc/frankenphp/acme-profile/classic.caddyfile b/src/variations/frankenphp/etc/frankenphp/acme-profile/classic.caddyfile new file mode 100644 index 000000000..34d207326 --- /dev/null +++ b/src/variations/frankenphp/etc/frankenphp/acme-profile/classic.caddyfile @@ -0,0 +1,7 @@ +# Request Let's Encrypt's "classic" certificate profile. +# +# Note: configuring cert_issuer pins issuance to Let's Encrypt only (this +# drops the default ZeroSSL fallback). +cert_issuer acme { + profile classic +} diff --git a/src/variations/frankenphp/etc/frankenphp/acme-profile/off.caddyfile b/src/variations/frankenphp/etc/frankenphp/acme-profile/off.caddyfile new file mode 100644 index 000000000..42d840342 --- /dev/null +++ b/src/variations/frankenphp/etc/frankenphp/acme-profile/off.caddyfile @@ -0,0 +1,5 @@ +# No ACME certificate profile is configured (default). +# +# Caddy keeps its stock issuer behavior, including the automatic +# Let's Encrypt + ZeroSSL fallback. Set CADDY_ACME_PROFILE to select a +# specific Let's Encrypt certificate profile instead. diff --git a/src/variations/frankenphp/etc/frankenphp/acme-profile/shortlived.caddyfile b/src/variations/frankenphp/etc/frankenphp/acme-profile/shortlived.caddyfile new file mode 100644 index 000000000..ef7b1a93d --- /dev/null +++ b/src/variations/frankenphp/etc/frankenphp/acme-profile/shortlived.caddyfile @@ -0,0 +1,12 @@ +# Request Let's Encrypt's "shortlived" certificate profile (~6-day certs). +# +# Note: configuring cert_issuer pins issuance to Let's Encrypt only (this +# drops the default ZeroSSL fallback). Short-lived certs renew roughly every +# 2 days, so the container needs reliable egress to the ACME CA. +# +# The shortlived profile is also required for IP-address certificates. For +# raw-IP / SNI-less access, also set a default SNI via CADDY_GLOBAL_OPTIONS, +# e.g. CADDY_GLOBAL_OPTIONS="default_sni {$APP_DOMAIN}". +cert_issuer acme { + profile shortlived +} diff --git a/src/variations/frankenphp/etc/frankenphp/acme-profile/tlsserver.caddyfile b/src/variations/frankenphp/etc/frankenphp/acme-profile/tlsserver.caddyfile new file mode 100644 index 000000000..73bd5d6e8 --- /dev/null +++ b/src/variations/frankenphp/etc/frankenphp/acme-profile/tlsserver.caddyfile @@ -0,0 +1,7 @@ +# Request Let's Encrypt's "tlsserver" certificate profile. +# +# Note: configuring cert_issuer pins issuance to Let's Encrypt only (this +# drops the default ZeroSSL fallback). +cert_issuer acme { + profile tlsserver +} From bd12ac83c119304ebc15c41b5f29806625e451c3 Mon Sep 17 00:00:00 2001 From: Jay Rogers
*Default: Off*|Even when display_errors is on, errors that occur during PHP's startup sequence are not displayed. (Official docs)| all `PHP_ERROR_LOG`
*Default: "/dev/stderr"*|Name of the file where script errors should be logged. . (Official docs)|all `PHP_ERROR_REPORTING`
*Default: "22527"*|Set PHP error reporting level. Must be a number. Use this tool for help. (Official docs)|all +`PHP_FILE_UPLOADS`
*Default: "On"*|Whether to allow HTTP file uploads. (Official docs)|all `PHP_FPM_CHILD_PROCESS_USER`
*Default: "www-data"*| â ī¸ Only used if container is running as root. Set the user of the PHP-FPM child processes. (Official docs)|fpm* `PHP_FPM_CHILD_PROCESS_GROUP`
*Default: "www-data"*| â ī¸ Only used if container is running as root. Set the group of the PHP-FPM child processes. (Official docs)|fpm* `PHP_FPM_PM_CONTROL`
*Defaults:
fpm: dynamic
fpm-apache: ondemand
fpm-nginx: ondemand*|Choose how the process manager will control the number of child processes. (Official docs)|fpm* @@ -93,6 +94,7 @@ Setting environment variables all depends on what method you're using to run you `PHP_FPM_POOL_NAME`
*Default: "www"*|Set the name of your PHP-FPM pool (helpful when running multiple sites on a single server).|fpm* `PHP_FPM_PROCESS_CONTROL_TIMEOUT`
*Default: "10s"*|Set the timeout for the process control commands. (Official docs)|fpm* `PHP_MAX_EXECUTION_TIME`
*Default: "99"*|Set the maximum time in seconds a script is allowed to run before it is terminated by the parser. (Official docs)|all +`PHP_MAX_FILE_UPLOADS`
*Default: "20"*|The maximum number of files allowed to be uploaded in a single request. (Official docs)|all `PHP_MAX_INPUT_TIME`
*Default: "-1"*|This sets the maximum time in seconds a script is allowed to parse input data, like POST and GET. Timing begins at the moment PHP is invoked at the server and ends when execution begins. The default setting is -1, which means that max_execution_time is used instead. Set to 0 to allow unlimited time. This directive is hardcoded to -1 for the CLI SAPI by PHP. (Official docs)|all `PHP_MAX_INPUT_VARS`
*Default: "1000"*|Set the limits for number of input variables (e.g., POST, GET, or COOKIE variables) that PHP will process in a single request. (Official docs)|all `PHP_MEMORY_LIMIT`
*Default: "256M"*|Set the maximum amount of memory in bytes that a script is allowed to allocate. (Official docs)|all diff --git a/src/common/usr/local/etc/php/conf.d/serversideup-docker-php.ini b/src/common/usr/local/etc/php/conf.d/serversideup-docker-php.ini index 0bbeec28c..36c103def 100644 --- a/src/common/usr/local/etc/php/conf.d/serversideup-docker-php.ini +++ b/src/common/usr/local/etc/php/conf.d/serversideup-docker-php.ini @@ -849,7 +849,7 @@ enable_dl = Off ; Whether to allow HTTP file uploads. ; https://php.net/file-uploads -file_uploads = On +file_uploads = ${PHP_FILE_UPLOADS} ; Temporary directory for HTTP uploaded files (will use system default if not ; specified). @@ -861,7 +861,7 @@ file_uploads = On upload_max_filesize = ${PHP_UPLOAD_MAX_FILE_SIZE} ; Maximum number of files that can be uploaded via a single request -max_file_uploads = 20 +max_file_uploads = ${PHP_MAX_FILE_UPLOADS} ;;;;;;;;;;;;;;;;;; ; Fopen wrappers ; diff --git a/src/variations/cli/Dockerfile b/src/variations/cli/Dockerfile index 9e64137f5..faadcfff6 100644 --- a/src/variations/cli/Dockerfile +++ b/src/variations/cli/Dockerfile @@ -33,7 +33,9 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_DISPLAY_STARTUP_ERRORS=Off \ PHP_ERROR_LOG="/dev/stderr" \ PHP_ERROR_REPORTING="22527" \ + PHP_FILE_UPLOADS="On" \ PHP_MAX_EXECUTION_TIME="99" \ + PHP_MAX_FILE_UPLOADS="20" \ PHP_MAX_INPUT_TIME="-1" \ PHP_MAX_INPUT_VARS="1000" \ PHP_MEMORY_LIMIT="256M" \ diff --git a/src/variations/fpm-apache/Dockerfile b/src/variations/fpm-apache/Dockerfile index 0fa0d3fc1..7c1c5e364 100644 --- a/src/variations/fpm-apache/Dockerfile +++ b/src/variations/fpm-apache/Dockerfile @@ -61,6 +61,7 @@ ENV APACHE_DOCUMENT_ROOT=/var/www/html/public \ PHP_DISPLAY_STARTUP_ERRORS=Off \ PHP_ERROR_LOG="/dev/stderr" \ PHP_ERROR_REPORTING="22527" \ + PHP_FILE_UPLOADS="On" \ PHP_FPM_PM_CONTROL=ondemand \ PHP_FPM_PM_MAX_CHILDREN="20" \ PHP_FPM_PM_MAX_REQUESTS="0" \ @@ -71,6 +72,7 @@ ENV APACHE_DOCUMENT_ROOT=/var/www/html/public \ PHP_FPM_POOL_NAME="www" \ PHP_FPM_PROCESS_CONTROL_TIMEOUT="10s" \ PHP_MAX_EXECUTION_TIME="99" \ + PHP_MAX_FILE_UPLOADS="20" \ PHP_MAX_INPUT_TIME="-1" \ PHP_MAX_INPUT_VARS="1000" \ PHP_MEMORY_LIMIT="256M" \ diff --git a/src/variations/fpm-nginx/Dockerfile b/src/variations/fpm-nginx/Dockerfile index e945a3d57..83a4d944a 100644 --- a/src/variations/fpm-nginx/Dockerfile +++ b/src/variations/fpm-nginx/Dockerfile @@ -135,6 +135,7 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_DISPLAY_STARTUP_ERRORS=Off \ PHP_ERROR_LOG="/dev/stderr" \ PHP_ERROR_REPORTING="22527" \ + PHP_FILE_UPLOADS="On" \ PHP_FPM_PM_CONTROL=ondemand \ PHP_FPM_PM_MAX_CHILDREN="20" \ PHP_FPM_PM_MAX_REQUESTS="0" \ @@ -145,6 +146,7 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_FPM_POOL_NAME="www" \ PHP_FPM_PROCESS_CONTROL_TIMEOUT="10s" \ PHP_MAX_EXECUTION_TIME="99" \ + PHP_MAX_FILE_UPLOADS="20" \ PHP_MAX_INPUT_TIME="-1" \ PHP_MAX_INPUT_VARS="1000" \ PHP_MEMORY_LIMIT="256M" \ diff --git a/src/variations/fpm/Dockerfile b/src/variations/fpm/Dockerfile index 33294b908..2d39f76f6 100644 --- a/src/variations/fpm/Dockerfile +++ b/src/variations/fpm/Dockerfile @@ -33,6 +33,7 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_DISPLAY_STARTUP_ERRORS=Off \ PHP_ERROR_LOG="/dev/stderr" \ PHP_ERROR_REPORTING="22527" \ + PHP_FILE_UPLOADS="On" \ PHP_FPM_PM_CONTROL=dynamic \ PHP_FPM_PM_MAX_CHILDREN="20" \ PHP_FPM_PM_MAX_REQUESTS="0" \ @@ -43,6 +44,7 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_FPM_POOL_NAME="www" \ PHP_FPM_PROCESS_CONTROL_TIMEOUT="10s" \ PHP_MAX_EXECUTION_TIME="99" \ + PHP_MAX_FILE_UPLOADS="20" \ PHP_MAX_INPUT_TIME="-1" \ PHP_MAX_INPUT_VARS="1000" \ PHP_MEMORY_LIMIT="256M" \ diff --git a/src/variations/frankenphp/Dockerfile b/src/variations/frankenphp/Dockerfile index 9639b660b..c85285712 100644 --- a/src/variations/frankenphp/Dockerfile +++ b/src/variations/frankenphp/Dockerfile @@ -152,7 +152,9 @@ LABEL org.opencontainers.image.title="serversideup/php (frankenphp)" \ PHP_DISPLAY_STARTUP_ERRORS=Off \ PHP_ERROR_LOG="/dev/stderr" \ PHP_ERROR_REPORTING="22527" \ + PHP_FILE_UPLOADS="On" \ PHP_MAX_EXECUTION_TIME="99" \ + PHP_MAX_FILE_UPLOADS="20" \ PHP_MAX_INPUT_TIME="-1" \ PHP_MAX_INPUT_VARS="1000" \ PHP_MEMORY_LIMIT="256M" \