From 39e4b163ed89fa9ee88f259551f877b52aa79bcb Mon Sep 17 00:00:00 2001 From: Florent Baldino Date: Fri, 15 Mar 2019 10:42:02 +0100 Subject: [PATCH] Upgrade to PHP 7.3 --- Dockerfile | 3 ++- fpm-alpine/Dockerfile | 8 ++++---- ppm-alpine/Dockerfile | 11 +++++------ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Dockerfile b/Dockerfile index 30c79ab..cfff4e4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-apache +FROM php:7.3-apache ONBUILD ARG GIT_REFERENCE ONBUILD ENV GIT_REFERENCE ${GIT_REFERENCE:-HEAD} @@ -32,6 +32,7 @@ RUN mkdir -p /usr/share/man/man1 && \ imagemagick \ ghostscript \ zip \ + libzip-dev \ libmagickwand-dev \ acl \ pdftk && \ diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile index cc58692..56ccf07 100644 --- a/fpm-alpine/Dockerfile +++ b/fpm-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-fpm-alpine +FROM php:7.3-fpm-alpine COPY --from=composer:latest /usr/bin/composer /usr/bin/composer @@ -17,14 +17,14 @@ ONBUILD LABEL org.label-schema.vendor="Wizbii" \ org.label-schema.schema-version="1.0" \ org.label-schema.build-date="${BUILD_DATE}" -RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev && \ +RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ pecl install mongodb && \ docker-php-ext-enable mongodb && \ docker-php-ext-install bcmath intl opcache zip sockets && \ version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ - curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -L -s https://packages.blackfire.io/binaries/blackfire-php/1.23.1/blackfire-php-alpine_amd64-php-$version.so && \ + curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -s https://packages.blackfire.io/binaries/blackfire-php/1.24.4/blackfire-php-alpine_amd64-php-$version.so && \ printf "extension=blackfire.so\nblackfire.agent_socket=tcp://10.1.1.1:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini && \ - apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \ + apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted && \ apk del --purge autoconf g++ make ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php diff --git a/ppm-alpine/Dockerfile b/ppm-alpine/Dockerfile index 374850e..1c9d7c8 100644 --- a/ppm-alpine/Dockerfile +++ b/ppm-alpine/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.2-alpine +FROM php:7.3-alpine COPY --from=composer:latest /usr/bin/composer /usr/bin/composer @@ -17,15 +17,14 @@ ONBUILD LABEL org.label-schema.vendor="Wizbii" \ org.label-schema.schema-version="1.0" \ org.label-schema.build-date="${BUILD_DATE}" -RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev && \ +RUN apk add --no-cache autoconf openssl-dev g++ make pcre-dev icu-dev zlib-dev libzip-dev && \ pecl install mongodb && \ docker-php-ext-enable mongodb && \ - docker-php-ext-install pcntl bcmath intl opcache zip && \ + docker-php-ext-install pcntl bcmath intl opcache zip sockets && \ version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") && \ - curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -L -s https://packages.blackfire.io/binaries/blackfire-php/1.23.1/blackfire-php-alpine_amd64-php-$version.so && \ + curl -A "Docker" -o $(php -r "echo ini_get('extension_dir');")/blackfire.so -D -s https://packages.blackfire.io/binaries/blackfire-php/1.24.4/blackfire-php-alpine_amd64-php-$version.so && \ printf "extension=blackfire.so\nblackfire.agent_socket=tcp://10.1.1.1:8707\n" > $PHP_INI_DIR/conf.d/blackfire.ini && \ - - apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/testing/ --allow-untrusted && \ + apk add gnu-libiconv --update-cache --repository http://dl-cdn.alpinelinux.org/alpine/edge/community/ --allow-untrusted && \ apk del --purge autoconf g++ make ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php