From 02cadef0188ad06341c125b6e5a934a0d0650f65 Mon Sep 17 00:00:00 2001 From: dannc Date: Tue, 22 Feb 2022 15:36:59 +0700 Subject: [PATCH] bump php 7.4, 8.0, 8.1 versions also optimize image for 8.x: delete unused deps after install all extensions, make one docker layer for this --- readme.md | 6 +++--- v7.4/Dockerfile | 2 +- v8.0/Dockerfile | 16 +++++++++------- v8.1/Dockerfile | 17 +++++++++-------- 4 files changed, 22 insertions(+), 19 deletions(-) diff --git a/readme.md b/readme.md index 0618b4a..18ad552 100644 --- a/readme.md +++ b/readme.md @@ -6,13 +6,13 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions -* php 8.1.2 +* php 8.1.3 * composer 2.2.4 * xdebug 3.1.2 -* php 8.0.15 +* php 8.0.16 * composer 2.2.4 * xdebug 3.1.2 -* php 7.4.27 (latest) +* php 7.4.28 (latest) * composer 1.10.24 * xdebug 2.9.8 * rdkafka 3.1.2 diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile index 25421b2..3d69076 100644 --- a/v7.4/Dockerfile +++ b/v7.4/Dockerfile @@ -1,4 +1,4 @@ -FROM php:7.4.27-alpine +FROM php:7.4.28-alpine 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 \ diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile index f7b320b..31c5f96 100644 --- a/v8.0/Dockerfile +++ b/v8.0/Dockerfile @@ -1,12 +1,13 @@ -FROM php:8.0.15-alpine +FROM php:8.0.16-alpine + +ARG PHP_XDEBUG_VERSION=3.1.2 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 zsh - -RUN docker-php-ext-configure gd --enable-gd \ + imap-dev openssl-dev git zsh \ + && docker-php-ext-configure gd --enable-gd \ --with-freetype \ --with-jpeg \ --with-webp \ @@ -15,10 +16,11 @@ RUN docker-php-ext-configure gd --enable-gd \ && 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 + && docker-php-ext-install imap \ + && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \ + && apk del $PHPIZE_DEPS \ + zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev -ARG PHP_XDEBUG_VERSION=3.1.2 -RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug # Install composer ARG COMPOSER_VERSION=2.2.4 diff --git a/v8.1/Dockerfile b/v8.1/Dockerfile index 6d3ce4e..366eb13 100644 --- a/v8.1/Dockerfile +++ b/v8.1/Dockerfile @@ -1,11 +1,12 @@ -FROM php:8.1.2-alpine +FROM php:8.1.3-alpine + +ARG PHP_XDEBUG_VERSION=3.1.2 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 \ - imap-dev openssl-dev git zsh - -RUN docker-php-ext-configure gd --enable-gd \ + imap-dev openssl-dev git zsh \ + && docker-php-ext-configure gd --enable-gd \ --with-freetype \ --with-jpeg \ --with-webp \ @@ -14,10 +15,10 @@ RUN docker-php-ext-configure gd --enable-gd \ && 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=3.1.2 -RUN pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug + && docker-php-ext-install imap \ + && pecl install xdebug-${PHP_XDEBUG_VERSION} && docker-php-ext-enable xdebug \ + && apk del $PHPIZE_DEPS \ + zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev # Install composer ARG COMPOSER_VERSION=2.2.4