diff options
| author | Jérémy Benoist <j0k3r@users.noreply.github.com> | 2019-05-29 11:14:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 11:14:00 +0200 |
| commit | 73ec68b1ffafb792265a3805833e5cd84c966aed (patch) | |
| tree | 33c6040c050f85c537f8dbf5e91d8c281db092cd /docker/php/Dockerfile | |
| parent | 2ba365c7c49556cd23b444dc3bb8d4a8cf08809d (diff) | |
| parent | 2cbee36a0184786644470a84fdd8c720cfcac58e (diff) | |
| download | wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.gz wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.tar.zst wallabag-73ec68b1ffafb792265a3805833e5cd84c966aed.zip | |
Merge pull request #3984 from wallabag/2.4
Merge 2.4 into master
Diffstat (limited to 'docker/php/Dockerfile')
| -rw-r--r-- | docker/php/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index d0266ec7..b632cb8a 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | FROM php:fpm | 1 | FROM php:7.2-fpm |
| 2 | 2 | ||
| 3 | # Default timezone. To change it, use the argument in the docker-compose.yml file | 3 | # Default timezone. To change it, use the argument in the docker-compose.yml file |
| 4 | ARG timezone='Europe/Paris' | 4 | ARG timezone='Europe/Paris' |