From 4e297f63a8682becef0c94e64dec091d0fce159b Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Sun, 16 Aug 2020 16:09:08 +0100 Subject: [PATCH 1/2] Update Dockerfile (#347) update to php 7.4 as 7.2 is nearing the end of its LTS --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bde127c..16c19b6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.4-apache # Install extensions RUN apt-get update && apt-get install -y \ From e0ff93a64d30ca2c86b9ab5210a92b2d1327b99f Mon Sep 17 00:00:00 2001 From: Simon Smith Date: Sun, 16 Aug 2020 16:24:43 +0100 Subject: [PATCH 2/2] Update Dockerfile (#348) fix GD parameters for php 7.4 (https://github.com/docker-library/php/issues/931) --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 16c19b6..b455ef2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update && apt-get install -y \ libjpeg62-turbo-dev \ libpng-dev \ && docker-php-ext-install -j$(nproc) iconv \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + && docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ \ && docker-php-ext-install -j$(nproc) gd # Prepare files and folders