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 a9789ef6..3e6f2d43 100644 --- a/docs/content/docs/8.reference/1.environment-variable-specification.md +++ b/docs/content/docs/8.reference/1.environment-variable-specification.md @@ -27,6 +27,7 @@ Setting environment variables all depends on what method you're using to run you `APACHE_START_SERVERS`
*Default: "2"*|Sets the number of child server processes created on startup.(Official docs)|fpm-apache `APACHE_THREAD_LIMIT`
*Default: "64"*|Set the maximum configured value for ThreadsPerChild for the lifetime of the Apache httpd process. (Official docs)|fpm-apache `APACHE_THREADS_PER_CHILD`
*Default: "25"*|This directive sets the number of threads created by each child process. (Official docs)|fpm-apache +`TZ`
*Default: "UTC"*|Operate your container in your local Time Zone.|all `APP_BASE_DIR`
*Default: "/var/www/html"*|Change this only if you mount your application to a different directory within the container. ℹ️ Be sure to change `NGINX_WEBROOT`, `APACHE_DOCUMENT_ROOT`, or `CADDY_SERVER_ROOT` if it applies to your use case as well.|all `AUTORUN_DEBUG`
*Default: "false"*|Enable debug mode for the Laravel automations. | all `AUTORUN_ENABLED`
*Default: "false"*|Enable or disable all automations. It's advised to set this to `false` in certain CI environments (especially during a composer install). If this is set to `false`, all `AUTORUN_*` behaviors will also be disabled.| all @@ -52,6 +53,7 @@ Setting environment variables all depends on what method you're using to run you `CADDY_HTTPS_PORT`
*Default: "8443"*|Set the port for HTTPS. (Official docs)|frankenphp `CADDY_HTTPS_SERVER_ADDRESS`
*Default: "https://"*|Set the server address for HTTPS. (Official docs)|frankenphp `CADDY_LOG_FORMAT`
*Default: "console"*|Set the format for the Caddy log. (Official docs)|frankenphp +`CADDY_LOG_DATETIME_FORMAT`
*Default: "wall_milli"*|Set the format of the timestamp in the Caddy logs. (Official docs)|frankenphp `CADDY_LOG_OUTPUT`
*Default: "stdout"*|Set the output for the Caddy log. (Official docs)|frankenphp `CADDY_PHP_SERVER_OPTIONS`
*Default: ""*|Set PHP server options for the Caddy server. (Official docs)|frankenphp `CADDY_SERVER_EXTRA_DIRECTIVES`
*Default: ""*|Set extra directives for the Caddy server. (Official docs)|frankenphp diff --git a/src/variations/cli/Dockerfile b/src/variations/cli/Dockerfile index 9e64137f..b4a36db6 100644 --- a/src/variations/cli/Dockerfile +++ b/src/variations/cli/Dockerfile @@ -22,7 +22,8 @@ LABEL org.opencontainers.image.title="serversideup/php (cli)" \ org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \ org.opencontainers.image.licenses="GPL-3.0-or-later" -ENV APP_BASE_DIR=/var/www/html \ +ENV TZ=UTC \ + APP_BASE_DIR=/var/www/html \ COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/composer \ COMPOSER_MAX_PARALLEL_HTTP=24 \ diff --git a/src/variations/fpm-apache/Dockerfile b/src/variations/fpm-apache/Dockerfile index 3d4e52f5..1f6b8a36 100644 --- a/src/variations/fpm-apache/Dockerfile +++ b/src/variations/fpm-apache/Dockerfile @@ -37,7 +37,8 @@ LABEL org.opencontainers.image.title="serversideup/php (fpm-apache)" \ org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \ org.opencontainers.image.licenses="GPL-3.0-or-later" -ENV APACHE_DOCUMENT_ROOT=/var/www/html/public \ +ENV TZ=UTC \ + APACHE_DOCUMENT_ROOT=/var/www/html/public \ APACHE_HTTP_PORT="8080" \ APACHE_HTTPS_PORT="8443" \ APACHE_START_SERVERS="2" \ diff --git a/src/variations/fpm-nginx/Dockerfile b/src/variations/fpm-nginx/Dockerfile index 83518d33..ebbb13d8 100644 --- a/src/variations/fpm-nginx/Dockerfile +++ b/src/variations/fpm-nginx/Dockerfile @@ -113,7 +113,8 @@ LABEL org.opencontainers.image.title="serversideup/php (fpm-nginx)" \ org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \ org.opencontainers.image.licenses="GPL-3.0-or-later" -ENV APP_BASE_DIR=/var/www/html \ +ENV TZ=UTC \ + APP_BASE_DIR=/var/www/html \ COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/composer \ COMPOSER_MAX_PARALLEL_HTTP=24 \ diff --git a/src/variations/fpm/Dockerfile b/src/variations/fpm/Dockerfile index 33294b90..bf86788f 100644 --- a/src/variations/fpm/Dockerfile +++ b/src/variations/fpm/Dockerfile @@ -22,7 +22,8 @@ LABEL org.opencontainers.image.title="serversideup/php (fpm)" \ org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \ org.opencontainers.image.licenses="GPL-3.0-or-later" -ENV APP_BASE_DIR=/var/www/html \ +ENV TZ=UTC \ + APP_BASE_DIR=/var/www/html \ COMPOSER_ALLOW_SUPERUSER=1 \ COMPOSER_HOME=/composer \ COMPOSER_MAX_PARALLEL_HTTP=24 \ diff --git a/src/variations/frankenphp/Dockerfile b/src/variations/frankenphp/Dockerfile index 50813be4..b068390d 100644 --- a/src/variations/frankenphp/Dockerfile +++ b/src/variations/frankenphp/Dockerfile @@ -125,7 +125,8 @@ LABEL org.opencontainers.image.title="serversideup/php (frankenphp)" \ org.opencontainers.image.version="${REPOSITORY_BUILD_VERSION}" \ org.opencontainers.image.licenses="GPL-3.0-or-later" - ENV APP_BASE_DIR=/var/www/html \ + ENV TZ=UTC \ + APP_BASE_DIR=/var/www/html \ CADDY_ADMIN="off" \ CADDY_AUTO_HTTPS="off" \ CADDY_GLOBAL_OPTIONS="" \ @@ -134,6 +135,7 @@ LABEL org.opencontainers.image.title="serversideup/php (frankenphp)" \ CADDY_HTTP_SERVER_ADDRESS="http://" \ CADDY_HTTPS_SERVER_ADDRESS="https://" \ CADDY_LOG_FORMAT="console" \ + CADDY_LOG_DATETIME_FORMAT="wall_milli" \ CADDY_LOG_OUTPUT="stdout" \ CADDY_PHP_SERVER_OPTIONS="" \ CADDY_SERVER_EXTRA_DIRECTIVES="" \ diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile index 22f4e061..8a17bd59 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/alert.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/crit.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } 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 0d972084..2f6bd9c4 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,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:INFO} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/emerg.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/error.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile index 0d972084..2f6bd9c4 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/info.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:INFO} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile index 0d972084..2f6bd9c4 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/notice.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:INFO} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile index 4755f020..6a8faad3 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/address/warn.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:WARN} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/alert.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/crit.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile index 90124e28..67dfbb95 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/debug.caddyfile @@ -1,6 +1,9 @@ debug log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:DEBUG} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/emerg.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile index 22f4e061..a91385e6 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/error.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:ERROR} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile index 0d972084..2f6bd9c4 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/info.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:INFO} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile index 0d972084..2f6bd9c4 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/notice.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:INFO} } diff --git a/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile b/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile index 4755f020..6a8faad3 100644 --- a/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile +++ b/src/variations/frankenphp/etc/frankenphp/log-level/global/warn.caddyfile @@ -1,5 +1,8 @@ log { - format {$CADDY_LOG_FORMAT:console} + format {$CADDY_LOG_FORMAT:console} { + time_format {$CADDY_LOG_DATETIME_FORMAT:wall_milli} + time_local + } output {$CADDY_LOG_OUTPUT:stdout} level {$CADDY_SERVER_LOG_LEVEL:WARN} }