From 68fbd8d60495d499c4731124cd19f716c0fb21bc Mon Sep 17 00:00:00 2001 From: dannc Date: Mon, 7 Sep 2020 11:11:54 +0700 Subject: [PATCH] bump php versions, add composer version, refactoring dockerfiles --- readme.md | 9 ++++++--- v7.2/Dockerfile | 27 +++++++++++++++------------ v7.3/Dockerfile | 27 +++++++++++++++------------ v7.4/Dockerfile | 33 ++++++++++++++++++--------------- 4 files changed, 54 insertions(+), 42 deletions(-) diff --git a/readme.md b/readme.md index bba872b..a0786b8 100644 --- a/readme.md +++ b/readme.md @@ -6,15 +6,18 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions -* php 7.4.8 +* php 7.4.10 + * composer 1.10.10 * xdebug 2.9.5 * rdkafka 3.1.2 * timecop 1.2.10 -* php 7.3.20 +* php 7.3.22 + * composer 1.10.10 * xdebug 2.9.5 * rdkafka 3.1.2 * timecop 1.2.10 -* php 7.2.32 +* php 7.2.33 + * composer 1.10.10 * xdebug 2.7.2 * rdkafka 3.1.2 * timecop 1.2.10 diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile index 0916fb8..fe760b9 100644 --- a/v7.2/Dockerfile +++ b/v7.2/Dockerfile @@ -1,33 +1,36 @@ -FROM php:7.2.32-alpine +FROM php:7.2.33-alpine -ARG PHP_XDEBUG_VERSION=2.7.2 -ARG PHP_RDKAFKA_VERSION=3.1.2 -ARG PHP_TIMECOP_VERSION=1.2.10 - -RUN apk update && apk add --no-cache $PHPIZE_DEPS -RUN apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl gmp-dev librdkafka-dev imap-dev openssl-dev git +RUN apk update && apk add --no-cache $PHPIZE_DEPS \ + && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ + curl gmp-dev librdkafka-dev imap-dev openssl-dev git RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \ --with-png-dir=/usr/include/ \ --with-webp-dir=/usr/include/ \ - && docker-php-ext-install gd -RUN docker-php-ext-configure bcmath && docker-php-ext-install bcmath -RUN docker-php-ext-install zip -RUN docker-php-ext-install gmp + && docker-php-ext-install gd \ + && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \ + && docker-php-ext-install zip \ + && docker-php-ext-install gmp + +ARG PHP_XDEBUG_VERSION=2.7.2 RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug + +ARG PHP_RDKAFKA_VERSION=3.1.2 RUN pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka RUN docker-php-ext-configure imap --with-imap-ssl \ && docker-php-ext-install imap # Install composer +ARG COMPOSER_VERSION=1.10.10 RUN curl -sS https://getcomposer.org/installer | php -- \ --filename=composer \ + --version=${COMPOSER_VERSION}\ --install-dir=/usr/local/bin RUN mkdir -m 777 -p /var/composer/ ENV COMPOSER_HOME /var/composer/ # Install timecop +ARG PHP_TIMECOP_VERSION=1.2.10 RUN curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \ && mkdir -p timecop \ && tar xfz /tmp/timecop.tar.gz -C timecop --strip-components=1 \ diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile index 1533d6c..8ed4dd1 100644 --- a/v7.3/Dockerfile +++ b/v7.3/Dockerfile @@ -1,33 +1,36 @@ -FROM php:7.3.20-alpine +FROM php:7.3.22-alpine -ARG PHP_XDEBUG_VERSION=2.9.5 -ARG PHP_RDKAFKA_VERSION=3.1.2 -ARG PHP_TIMECOP_VERSION=1.2.10 - -RUN apk update && apk add --no-cache $PHPIZE_DEPS -RUN apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git +RUN apk update && apk add --no-cache $PHPIZE_DEPS \ + && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ + curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ \ --with-jpeg-dir=/usr/include/ \ --with-png-dir=/usr/include/ \ --with-webp-dir=/usr/include/ \ - && docker-php-ext-install gd -RUN docker-php-ext-configure bcmath && docker-php-ext-install bcmath -RUN docker-php-ext-configure zip --with-libzip && docker-php-ext-install zip -RUN docker-php-ext-install gmp + && docker-php-ext-install gd \ + && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \ + && docker-php-ext-configure zip --with-libzip && docker-php-ext-install zip \ + && docker-php-ext-install gmp + +ARG PHP_XDEBUG_VERSION=2.9.5 RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug + +ARG PHP_RDKAFKA_VERSION=3.1.2 RUN pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka RUN docker-php-ext-configure imap --with-imap-ssl \ && docker-php-ext-install imap # Install composer +ARG COMPOSER_VERSION=1.10.10 RUN curl -sS https://getcomposer.org/installer | php -- \ --filename=composer \ + --version=${COMPOSER_VERSION} \ --install-dir=/usr/local/bin RUN mkdir -m 777 -p /var/composer/ ENV COMPOSER_HOME /var/composer/ # Install timecop +ARG PHP_TIMECOP_VERSION=1.2.10 RUN curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \ && mkdir -p timecop \ && tar xfz /tmp/timecop.tar.gz -C timecop --strip-components=1 \ diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile index 9467de9..7d2ea5f 100644 --- a/v7.4/Dockerfile +++ b/v7.4/Dockerfile @@ -1,33 +1,36 @@ -FROM php:7.4.8-alpine +FROM php:7.4.10-alpine -ARG PHP_XDEBUG_VERSION=2.9.5 -ARG PHP_RDKAFKA_VERSION=3.1.2 -ARG PHP_TIMECOP_VERSION=1.2.10 - -RUN apk update && apk add --no-cache $PHPIZE_DEPS -RUN apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ - curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git +RUN apk update && apk add --no-cache $PHPIZE_DEPS \ + && apk add --no-cache zlib-dev gd-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev \ + curl zip libzip-dev gmp-dev librdkafka-dev imap-dev openssl-dev git RUN docker-php-ext-configure gd --enable-gd \ --with-freetype \ --with-jpeg \ --with-webp \ - && docker-php-ext-install gd -RUN docker-php-ext-configure bcmath && docker-php-ext-install bcmath -RUN docker-php-ext-configure zip --with-zip && docker-php-ext-install zip -RUN docker-php-ext-install gmp -RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug -RUN pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka -RUN PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \ + && docker-php-ext-install gd \ + && docker-php-ext-configure bcmath && docker-php-ext-install bcmath \ + && docker-php-ext-configure zip --with-zip && docker-php-ext-install zip \ + && docker-php-ext-install gmp \ + && PHP_OPENSSL=yes docker-php-ext-configure imap --with-imap-ssl \ && docker-php-ext-install imap +ARG PHP_XDEBUG_VERSION=2.9.5 +RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug + +ARG PHP_RDKAFKA_VERSION=3.1.2 +RUN pecl install rdkafka-${PHP_RDKAFKA_VERSION} && docker-php-ext-enable rdkafka + # Install composer +ARG COMPOSER_VERSION=1.10.10 RUN curl -sS https://getcomposer.org/installer | php -- \ --filename=composer \ + --version=${COMPOSER_VERSION} \ --install-dir=/usr/local/bin RUN mkdir -m 777 -p /var/composer/ ENV COMPOSER_HOME /var/composer/ # Install timecop +ARG PHP_TIMECOP_VERSION=1.2.10 RUN curl -L -o /tmp/timecop.tar.gz https://github.com/hnw/php-timecop/archive/v${PHP_TIMECOP_VERSION}.tar.gz \ && mkdir -p timecop \ && tar xfz /tmp/timecop.tar.gz -C timecop --strip-components=1 \