diff --git a/CHANGELOG.md b/CHANGELOG.md index 6ba16e6..6026511 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ Summary of release changes. +### 2.2.1 - Unreleased + +- Adds setting PHP `date.timezone` to `PHP_OPTIONS_DATE_TIMEZONE` into service configuration; removes dependency on app package configuration. + ### 2.2.0 - 2019-07-20 - Updates source image to [2.6.0](https://github.com/jdeathe/centos-ssh/releases/tag/2.6.0). diff --git a/Dockerfile b/Dockerfile index 0e8dde7..14516c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -165,7 +165,7 @@ RUN useradd -r -M -d /var/www/app -s /sbin/nologin app \ && sed -r \ -e 's~^;(user_ini.filename =)$~\1~g' \ -e 's~^;(cgi.fix_pathinfo=1)$~\1~g' \ - -e 's~^;(date.timezone =)$~\1 UTC~g' \ + -e 's~^;?(date.timezone( )?=).*$~\1\2"${PHP_OPTIONS_DATE_TIMEZONE:-UTC}"~g' \ -e 's~^(expose_php = )On$~\1Off~g' \ -e 's~^;(realpath_cache_size = ).*$~\14096k~' \ -e 's~^;(realpath_cache_ttl = ).*$~\1600~' \