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..ccdf913f4 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 @@ -320,7 +320,7 @@ open_basedir = ${PHP_OPEN_BASEDIR} ; This directive allows you to disable certain functions. ; It receives a comma-delimited list of function names. ; https://php.net/disable-functions -disable_functions = +disable_functions = ${PHP_DISABLE_FUNCTIONS} ; This directive allows you to disable certain classes. ; It receives a comma-delimited list of class names. @@ -348,7 +348,7 @@ disable_classes = ; the file operations performed. ; Note: if open_basedir is set, the cache is disabled ; https://php.net/realpath-cache-size -;realpath_cache_size = 4096k +realpath_cache_size = ${PHP_REALPATH_CACHE_SIZE} ; Duration of time, in seconds for which to cache realpath information for a given ; file or directory. For systems with rarely changing files, consider increasing this @@ -563,7 +563,7 @@ report_memleaks = On ; the error message is formatted as HTML or not. ; Note: This directive is hardcoded to Off for the CLI SAPI ; https://php.net/html-errors -;html_errors = On +html_errors = ${PHP_HTML_ERRORS} ; If html_errors is set to On *and* docref_root is not empty, then PHP ; produces clickable error messages that direct to a page describing the error @@ -1425,7 +1425,7 @@ session.cookie_domain = ; Whether or not to add the httpOnly flag to the cookie, which makes it ; inaccessible to browser scripting languages such as JavaScript. ; https://php.net/session.cookie-httponly -session.cookie_httponly = +session.cookie_httponly = ${PHP_SESSION_COOKIE_HTTPONLY} ; Add SameSite attribute to cookie to help mitigate Cross-Site Request Forgery (CSRF/XSRF) ; Current valid values are "Strict", "Lax" or "None". When using "None", diff --git a/src/variations/cli/Dockerfile b/src/variations/cli/Dockerfile index 9e64137f5..d26b960be 100644 --- a/src/variations/cli/Dockerfile +++ b/src/variations/cli/Dockerfile @@ -50,7 +50,10 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPEN_BASEDIR="" \ PHP_POST_MAX_SIZE="100M" \ + PHP_HTML_ERRORS="1" \ + PHP_REALPATH_CACHE_SIZE="4M" \ PHP_REALPATH_CACHE_TTL="120" \ + PHP_SESSION_COOKIE_HTTPONLY="0" \ PHP_SESSION_COOKIE_SECURE=false \ PHP_UPLOAD_MAX_FILE_SIZE="100M" \ PHP_ZEND_DETECT_UNICODE="" \ diff --git a/src/variations/fpm-apache/Dockerfile b/src/variations/fpm-apache/Dockerfile index 3d4e52f55..2ac352ecf 100644 --- a/src/variations/fpm-apache/Dockerfile +++ b/src/variations/fpm-apache/Dockerfile @@ -87,7 +87,10 @@ ENV APACHE_DOCUMENT_ROOT=/var/www/html/public \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPEN_BASEDIR="" \ PHP_POST_MAX_SIZE="100M" \ + PHP_HTML_ERRORS="1" \ + PHP_REALPATH_CACHE_SIZE="4M" \ PHP_REALPATH_CACHE_TTL="120" \ + PHP_SESSION_COOKIE_HTTPONLY="0" \ PHP_SESSION_COOKIE_SECURE=false \ PHP_UPLOAD_MAX_FILE_SIZE="100M" \ PHP_ZEND_DETECT_UNICODE="" \ diff --git a/src/variations/fpm-nginx/Dockerfile b/src/variations/fpm-nginx/Dockerfile index 83518d33d..1c4383988 100644 --- a/src/variations/fpm-nginx/Dockerfile +++ b/src/variations/fpm-nginx/Dockerfile @@ -161,7 +161,10 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPEN_BASEDIR="" \ PHP_POST_MAX_SIZE="100M" \ + PHP_HTML_ERRORS="1" \ + PHP_REALPATH_CACHE_SIZE="4M" \ PHP_REALPATH_CACHE_TTL="120" \ + PHP_SESSION_COOKIE_HTTPONLY="0" \ PHP_SESSION_COOKIE_SECURE=false \ PHP_UPLOAD_MAX_FILE_SIZE="100M" \ PHP_ZEND_DETECT_UNICODE="" \ diff --git a/src/variations/fpm/Dockerfile b/src/variations/fpm/Dockerfile index 33294b908..152d6b5ee 100644 --- a/src/variations/fpm/Dockerfile +++ b/src/variations/fpm/Dockerfile @@ -59,7 +59,10 @@ ENV APP_BASE_DIR=/var/www/html \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPEN_BASEDIR="" \ PHP_POST_MAX_SIZE="100M" \ + PHP_HTML_ERRORS="1" \ + PHP_REALPATH_CACHE_SIZE="4M" \ PHP_REALPATH_CACHE_TTL="120" \ + PHP_SESSION_COOKIE_HTTPONLY="0" \ PHP_SESSION_COOKIE_SECURE=Off \ PHP_UPLOAD_MAX_FILE_SIZE="100M" \ PHP_ZEND_DETECT_UNICODE="" \ diff --git a/src/variations/frankenphp/Dockerfile b/src/variations/frankenphp/Dockerfile index 4eef319c3..44d8d8cfb 100644 --- a/src/variations/frankenphp/Dockerfile +++ b/src/variations/frankenphp/Dockerfile @@ -167,7 +167,10 @@ LABEL org.opencontainers.image.title="serversideup/php (frankenphp)" \ PHP_OPCACHE_VALIDATE_TIMESTAMPS="1" \ PHP_OPEN_BASEDIR="" \ PHP_POST_MAX_SIZE="100M" \ + PHP_HTML_ERRORS="1" \ + PHP_REALPATH_CACHE_SIZE="4M" \ PHP_REALPATH_CACHE_TTL="120" \ + PHP_SESSION_COOKIE_HTTPONLY="0" \ PHP_SESSION_COOKIE_SECURE=false \ PHP_UPLOAD_MAX_FILE_SIZE="100M" \ PHP_ZEND_DETECT_UNICODE="" \