From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Thu, 23 May 2019 09:57:07 +0000 (+0200)
Subject: Merge pull request #3977 from wallabag/fix/7.2-dockerfile
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=65b495e75b1d36894dd18133d3bf967a74e0b8de;hp=a2b5d67560341011e791b678422578ab8d6b1e3f;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3977 from wallabag/fix/7.2-dockerfile

Force PHP version in Dockerfile
---

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 @@
-FROM php:fpm
+FROM php:7.2-fpm
 
 # Default timezone. To change it, use the argument in the docker-compose.yml file
 ARG timezone='Europe/Paris'