diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-01-16 22:19:40 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-01-16 22:19:40 +0100 |
| commit | 4355849ec36efb3aa4b711912abd71e30cf2d5ee (patch) | |
| tree | b784231649f496add435a7a102a32120f172b71a | |
| parent | 9214eeecff363883d3d396490e8f1c7adf523c05 (diff) | |
Docker Alpine PHP timezone (#2218)
https://github.com/FreshRSS/FreshRSS/issues/2153
| -rw-r--r-- | Docker/Dockerfile | 2 | ||||
| -rw-r--r-- | Docker/README.md | 2 | ||||
| -rwxr-xr-x | Docker/entrypoint.sh | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/Docker/Dockerfile b/Docker/Dockerfile index 7aaee52a0..a4be9fd84 100644 --- a/Docker/Dockerfile +++ b/Docker/Dockerfile @@ -1,5 +1,7 @@ FROM alpine:3.8 +ENV TZ UTC + RUN apk add --no-cache \ apache2 php7-apache2 \ php7 php7-curl php7-gmp php7-intl php7-mbstring php7-xml php7-zip \ diff --git a/Docker/README.md b/Docker/README.md index 1a915f326..ac745c49d 100644 --- a/Docker/README.md +++ b/Docker/README.md @@ -66,6 +66,7 @@ sudo docker volume create freshrss-data sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ -v freshrss-data:/var/www/FreshRSS/data \ -e 'CRON_MIN=4,34' \ + -e TZ=Europe/Paris \ --net freshrss-network \ --label traefik.port=80 \ --label traefik.frontend.rule='Host:freshrss.example.net' \ @@ -74,6 +75,7 @@ sudo docker run -d --restart unless-stopped --log-opt max-size=10m \ --name freshrss freshrss/freshrss ``` +* Replace `TZ=Europe/Paris` by your [server timezone](http://php.net/timezones), or remove the line to use `UTC`. * If you cannot have FreshRSS at the root of a dedicated domain, update the command above according to the following model: `--label traefik.frontend.rule='Host:freshrss.example.net;PathPrefixStrip:/FreshRSS/' \` * You may remove the `--label traefik.*` lines if you do not use Træfik. diff --git a/Docker/entrypoint.sh b/Docker/entrypoint.sh index d4e1808bc..528388073 100755 --- a/Docker/entrypoint.sh +++ b/Docker/entrypoint.sh @@ -5,6 +5,8 @@ php -f ./cli/prepare.php > /dev/null chown -R :www-data . chmod -R g+r . && chmod -R g+w ./data/ +find /etc/php*/ -name php.ini -exec sed -r -i "\#^;?date.timezone#s#^.*#date.timezone = $TZ#" {} \; + if [ -n "$CRON_MIN" ]; then sed -r -i "\#FreshRSS#s#^[^ ]+ #$CRON_MIN #" /var/spool/cron/crontabs/root fi |