From b696c1f43d22481c1a6de7e96ff17aea094d618e Mon Sep 17 00:00:00 2001 From: J0WI Date: Fri, 20 Dec 2019 07:50:31 +0000 Subject: [PATCH] Update to PHP 7.4 (#257) * Update to PHP 7.4 --- Dockerfile-alpine.template | 13 ++++++++++--- Dockerfile-debian.template | 13 ++++++++++--- apache/Dockerfile | 13 ++++++++++--- fpm-alpine/Dockerfile | 13 ++++++++++--- fpm/Dockerfile | 13 ++++++++++--- 5 files changed, 50 insertions(+), 15 deletions(-) diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 822a9568..65c31c5e 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -1,4 +1,4 @@ -FROM php:7.2-%%VARIANT%% +FROM php:7.4-%%VARIANT%% # docker-entrypoint.sh dependencies RUN apk add --no-cache \ @@ -14,10 +14,17 @@ RUN set -ex; \ libpng-dev \ libwebp-dev \ libxpm-dev \ + libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \ - docker-php-ext-install bz2 gd mysqli opcache zip; \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + mysqli \ + opcache \ + zip \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 769677c4..52df106c 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -1,4 +1,4 @@ -FROM php:7.2-%%VARIANT%% +FROM php:7.4-%%VARIANT%% # Install dependencies RUN set -ex; \ @@ -13,10 +13,17 @@ RUN set -ex; \ libpng-dev \ libwebp-dev \ libxpm-dev \ + libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \ - docker-php-ext-install bz2 gd mysqli opcache zip; \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + mysqli \ + opcache \ + zip \ + ; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ diff --git a/apache/Dockerfile b/apache/Dockerfile index 9ef5ac04..ebb8154a 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.4-apache # Install dependencies RUN set -ex; \ @@ -13,10 +13,17 @@ RUN set -ex; \ libpng-dev \ libwebp-dev \ libxpm-dev \ + libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \ - docker-php-ext-install bz2 gd mysqli opcache zip; \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + mysqli \ + opcache \ + zip \ + ; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \ diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index bc4b4f30..c717b3e5 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine +FROM php:7.4-fpm-alpine # docker-entrypoint.sh dependencies RUN apk add --no-cache \ @@ -14,10 +14,17 @@ RUN set -ex; \ libpng-dev \ libwebp-dev \ libxpm-dev \ + libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \ - docker-php-ext-install bz2 gd mysqli opcache zip; \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + mysqli \ + opcache \ + zip \ + ; \ \ runDeps="$( \ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 16c517ef..9a542323 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm +FROM php:7.4-fpm # Install dependencies RUN set -ex; \ @@ -13,10 +13,17 @@ RUN set -ex; \ libpng-dev \ libwebp-dev \ libxpm-dev \ + libzip-dev \ ; \ \ - docker-php-ext-configure gd --with-freetype-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr --with-png-dir=/usr --with-xpm-dir=/usr; \ - docker-php-ext-install bz2 gd mysqli opcache zip; \ + docker-php-ext-configure gd --with-freetype --with-jpeg --with-webp --with-xpm; \ + docker-php-ext-install -j "$(nproc)" \ + bz2 \ + gd \ + mysqli \ + opcache \ + zip \ + ; \ \ apt-mark auto '.*' > /dev/null; \ apt-mark manual $savedAptMark; \