From b8d348a66af717ae33cd9aef3eecb299b29bbc9b Mon Sep 17 00:00:00 2001 From: Simon Hansen Date: Wed, 19 Feb 2020 21:51:17 +0100 Subject: [PATCH 1/3] update php version and align gd options --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9545944..00e702d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.3.8-fpm-alpine3.10 +FROM php:7.4.2-fpm-alpine3.10 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \ PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \ @@ -39,7 +39,7 @@ RUN apk info \ xvfb \ chromium@3.9 \ chromium-chromedriver@3.9 \ - && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-png-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ + && docker-php-ext-configure gd --with-freetype --with-jpeg \ && docker-php-ext-install -j$(nproc) \ gd \ pdo_mysql \ From eadb2f897da7caa4c36db666f14f1d525ac732d9 Mon Sep 17 00:00:00 2001 From: Phil-Bastian Berndt Date: Thu, 20 Feb 2020 11:30:50 +0100 Subject: [PATCH 2/3] remove mbstring extension installation --- Dockerfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 00e702d..932c5e7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,6 @@ RUN apk info \ intl \ opcache \ pcntl \ - mbstring \ iconv \ && pecl install \ redis \ From f9570e822c9f8dad315352ef771abdb960e9fb03 Mon Sep 17 00:00:00 2001 From: Phil-Bastian Berndt Date: Thu, 20 Feb 2020 12:24:35 +0100 Subject: [PATCH 3/3] upgrade to alpine 3.11 --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 932c5e7..6cd9b8d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.2-fpm-alpine3.10 +FROM php:7.4.2-fpm-alpine3.11 ENV PHP_OPCACHE_VALIDATE_TIMESTAMPS="0" \ PHP_OPCACHE_MAX_ACCELERATED_FILES="10000" \ @@ -10,6 +10,7 @@ RUN apk info \ && echo @edge http://nl.alpinelinux.org/alpine/edge/community >> /etc/apk/repositories \ && echo @edge http://nl.alpinelinux.org/alpine/edge/main >> /etc/apk/repositories \ && echo @3.9 http://dl-cdn.alpinelinux.org/alpine/v3.9/main >> /etc/apk/repositories \ + && echo @3.10 http://dl-cdn.alpinelinux.org/alpine/v3.10/main >> /etc/apk/repositories \ && apk update \ && apk upgrade \ && apk add --no-cache --virtual .build-deps \