This commit is contained in:
Sam
2018-04-05 14:29:10 +02:00
parent 5a1c1c16d7
commit 69d2f54b03
2 changed files with 7 additions and 7 deletions

View File

@@ -1,4 +1,4 @@
FROM php:7.0-fpm FROM php:7.2-fpm
MAINTAINER Samuel Laulhau <sam@lalop.co> MAINTAINER Samuel Laulhau <sam@lalop.co>
@@ -8,14 +8,14 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64 ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends \ && apt-get install -y --no-install-recommends \
libmcrypt-dev zlib1g-dev git libgmp-dev \ zlib1g-dev git libgmp-dev \
libfreetype6-dev libjpeg62-turbo-dev libpng12-dev \ libfreetype6-dev libjpeg62-turbo-dev libpng-dev \
build-essential chrpath libssl-dev libxft-dev \ build-essential chrpath libssl-dev libxft-dev \
libfreetype6 libfontconfig1 libfontconfig1-dev \ libfreetype6 libfontconfig1 libfontconfig1-dev \
&& ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \ && 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 gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-configure gmp \ && 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 \ && curl -o ${PHANTOMJS}.tar.bz2 -SL https://bitbucket.org/ariya/phantomjs/downloads/${PHANTOMJS}.tar.bz2 \
&& tar xvjf ${PHANTOMJS}.tar.bz2 \ && tar xvjf ${PHANTOMJS}.tar.bz2 \
&& rm ${PHANTOMJS}.tar.bz2 \ && rm ${PHANTOMJS}.tar.bz2 \

View File

@@ -1,4 +1,4 @@
FROM php:7.0-fpm-alpine FROM php:7.2-fpm-alpine
MAINTAINER Samuel Laulhau <sam@lalop.co> MAINTAINER Samuel Laulhau <sam@lalop.co>
@@ -7,13 +7,13 @@ MAINTAINER Samuel Laulhau <sam@lalop.co>
##### #####
ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64 ENV PHANTOMJS phantomjs-2.1.1-linux-x86_64
RUN apk update \ 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 coreutils chrpath fontconfig libpng-dev
RUN ln -s /usr/include/x86_64-linux-gnu/gmp.h /usr/local/include/ \ 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 gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ \
&& docker-php-ext-configure gmp \ && 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 && 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 \ RUN cd /usr/share \