From ebb9ebce97caee8d6a6115f883a5839f52b71dd6 Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Tue, 7 Apr 2020 15:38:17 +0300 Subject: [PATCH 1/2] Update Dockerfile --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index b00e85a..7eff5d9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,15 @@ -FROM php:7.2-fpm-alpine3.7 +FROM php:7.4-fpm-alpine3.11 MAINTAINER Dmitri Pisarev ARG PHP_REDIS_VERSION="3.1.6" -ARG PHP_YAML_VERSION="2.0.2" -ARG PHP_XDEBUG_VERSION="2.6.0beta1" +ARG PHP_YAML_VERSION="2.0.4" +ARG PHP_XDEBUG_VERSION="2.6.1" ARG S6_VERSION="1.21.2.2" ENV FLOW_REWRITEURLS 1 -ENV COMPOSER_VERSION 1.6.2 +ENV COMPOSER_VERSION 1.10.1 ENV COMPOSER_HOME /composer ENV PATH /composer/vendor/bin:$PATH ENV COMPOSER_ALLOW_SUPERUSER 1 From d05892e3d9ef940fac3c8cf422b6cc2f864e605b Mon Sep 17 00:00:00 2001 From: Dmitri Pisarev Date: Tue, 7 Apr 2020 16:41:31 +0300 Subject: [PATCH 2/2] Fix the build --- Dockerfile | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7eff5d9..e24219d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,9 +2,9 @@ FROM php:7.4-fpm-alpine3.11 MAINTAINER Dmitri Pisarev -ARG PHP_REDIS_VERSION="3.1.6" +ARG PHP_REDIS_VERSION="5.2.1" ARG PHP_YAML_VERSION="2.0.4" -ARG PHP_XDEBUG_VERSION="2.6.1" +ARG PHP_XDEBUG_VERSION="2.9.4" ARG S6_VERSION="1.21.2.2" ENV FLOW_REWRITEURLS 1 @@ -36,20 +36,17 @@ RUN set -x \ && apk del py-pip py-setuptools \ && apk add --virtual .phpize-deps $PHPIZE_DEPS libtool freetype-dev libpng-dev libjpeg-turbo-dev yaml-dev \ && docker-php-ext-configure gd \ - --with-gd \ - --with-freetype-dir=/usr/include/ \ - --with-png-dir=/usr/include/ \ - --with-jpeg-dir=/usr/include/ \ + --with-freetype \ + --with-jpeg \ && docker-php-ext-install \ - gd \ - pdo \ - pdo_mysql \ - mbstring \ - opcache \ - intl \ - exif \ - json \ - tokenizer \ + gd \ + pdo \ + pdo_mysql \ + opcache \ + intl \ + exif \ + json \ + tokenizer \ && pecl install redis-${PHP_REDIS_VERSION} yaml-${PHP_YAML_VERSION} xdebug-${PHP_XDEBUG_VERSION} \ && docker-php-ext-enable xdebug \ && docker-php-ext-enable redis \