From 69d2f54b03c782c1b536ebb7f4f3da0d3f3cbd84 Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 5 Apr 2018 14:29:10 +0200 Subject: [PATCH] php 7.2 --- Dockerfile | 8 ++++---- alpine/Dockerfile | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index fa4231e..e2a7da0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.0-fpm +FROM php:7.2-fpm MAINTAINER Samuel Laulhau @@ -8,14 +8,14 @@ MAINTAINER Samuel Laulhau ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64 RUN apt-get update \ && apt-get install -y --no-install-recommends \ - libmcrypt-dev zlib1g-dev git libgmp-dev \ - libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ + zlib1g-dev git libgmp-dev \ + libfreetype6-dev libjpeg62-turbo-dev libpng-dev \ build-essential chrpath libssl-dev libxft-dev \ libfreetype6 libfontconfig1 libfontconfig1-dev \ && ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-configure gmp \ - && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \ + && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \ && curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \ && tar xvjf ${PHANTOMJS}.tar.bz2 \ && rm ${PHANTOMJS}.tar.bz2 \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index e3ebc23..f3a3afe 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.0-fpm-alpine +FROM php:7.2-fpm-alpine MAINTAINER Samuel Laulhau @@ -7,13 +7,13 @@ MAINTAINER Samuel Laulhau ##### ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64 RUN apk update \ - && apk add --no-cache libmcrypt-dev git gmp-dev freetype-dev libjpeg-turbo-dev \ + && apk add --no-cache git gmp-dev freetype-dev libjpeg-turbo-dev \ coreutils chrpath fontconfig libpng-dev RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \ && docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \ && docker-php-ext-configure gmp \ - && docker-php-ext-install iconv mcrypt mbstring pdo pdo_mysql zip gd gmp opcache \ + && docker-php-ext-install iconv mbstring pdo pdo_mysql zip gd gmp opcache \ && echo "php_admin_value[error_reporting] = E_ALL & ~E_NOTICE & ~E_WARNING & ~E_STRICT & ~E_DEPRECATED">>/usr/local/etc/php-fpm.d/www.conf RUN cd /usr/share \