From 1435d9b8449275d6713aef983ac96ea653557be0 Mon Sep 17 00:00:00 2001 From: dannc Date: Tue, 3 Oct 2023 09:54:43 +0700 Subject: [PATCH] bump php and composer versions --- readme.md | 16 ++++++++-------- v7.2/Dockerfile | 4 ++-- v7.3/Dockerfile | 4 ++-- v7.4/Dockerfile | 4 ++-- v8.0/Dockerfile | 2 +- v8.1/Dockerfile | 4 ++-- v8.2/Dockerfile | 4 ++-- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/readme.md b/readme.md index e452f29..56d4924 100644 --- a/readme.md +++ b/readme.md @@ -6,27 +6,27 @@ Images can be found on [docker hub](https://hub.docker.com/repository/docker/dan #### Supported versions -* php 8.2.10 - * composer 2.6.2 +* php 8.2.11 + * composer 2.6.4 * xdebug 3.2.2 -* php 8.1.23 - * composer 2.6.2 +* php 8.1.24 + * composer 2.6.4 * xdebug 3.2.2 * php 8.0.30 - * composer 2.6.2 + * composer 2.6.4 * xdebug 3.2.2 * php 7.4.33 (latest) - * composer 2.6.2 + * composer 2.6.4 * xdebug 2.9.8 * rdkafka 6.0.3 * timecop 1.2.10 * php 7.3.33 - * composer 2.6.2 + * composer 2.6.4 * xdebug 2.9.8 * rdkafka 6.0.3 * timecop 1.2.10 * php 7.2.34 - * composer 2.6.2 + * composer 2.6.4 * xdebug 2.7.2 * rdkafka 6.0.3 * timecop 1.2.10 diff --git a/v7.2/Dockerfile b/v7.2/Dockerfile index 9ff3fae..b09504a 100644 --- a/v7.2/Dockerfile +++ b/v7.2/Dockerfile @@ -3,7 +3,7 @@ FROM php:7.2.34-alpine ARG PHP_XDEBUG_VERSION=2.7.2 ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \ @@ -38,7 +38,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \ RUN curl -sS https://getcomposer.org/installer | php -- \ --filename=composer \ - --version=${COMPOSER_VERSION}\ + --version=${COMPOSER_VERSION} \ --install-dir=/usr/local/bin RUN mkdir -m 777 -p /var/composer/ ENV COMPOSER_HOME /var/composer/ diff --git a/v7.3/Dockerfile b/v7.3/Dockerfile index 4b72954..e4410e7 100644 --- a/v7.3/Dockerfile +++ b/v7.3/Dockerfile @@ -3,7 +3,7 @@ FROM php:7.3.33-alpine ARG PHP_XDEBUG_VERSION=2.9.8 ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \ @@ -31,7 +31,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && make -j$(nproc) \ && make install \ ) \ - && rm -r timecop \ + && rm -rf timecop \ && docker-php-ext-enable timecop \ && apk del $PHPIZE_DEPS \ zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev diff --git a/v7.4/Dockerfile b/v7.4/Dockerfile index 641acc2..ad828a6 100644 --- a/v7.4/Dockerfile +++ b/v7.4/Dockerfile @@ -3,7 +3,7 @@ FROM php:7.4.33-alpine ARG PHP_XDEBUG_VERSION=2.9.8 ARG PHP_RDKAFKA_VERSION=6.0.3 ARG PHP_TIMECOP_VERSION=1.2.10 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && apk add --no-cache zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev \ @@ -31,7 +31,7 @@ RUN apk update && apk add --no-cache $PHPIZE_DEPS \ && make -j$(nproc) \ && make install \ ) \ - && rm -r timecop \ + && rm -rf timecop \ && docker-php-ext-enable timecop \ && apk del $PHPIZE_DEPS \ zlib-dev libwebp-dev freetype-dev libpng-dev libjpeg-turbo-dev openssl-dev diff --git a/v8.0/Dockerfile b/v8.0/Dockerfile index 8ffa16e..99d873c 100644 --- a/v8.0/Dockerfile +++ b/v8.0/Dockerfile @@ -1,7 +1,7 @@ FROM php:8.0.30-alpine ARG PHP_XDEBUG_VERSION=3.2.2 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 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.1/Dockerfile b/v8.1/Dockerfile index 8989b18..b86f8b6 100644 --- a/v8.1/Dockerfile +++ b/v8.1/Dockerfile @@ -1,7 +1,7 @@ -FROM php:8.1.23-alpine +FROM php:8.1.24-alpine ARG PHP_XDEBUG_VERSION=3.2.2 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 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.2/Dockerfile b/v8.2/Dockerfile index 94c3f05..54893ff 100644 --- a/v8.2/Dockerfile +++ b/v8.2/Dockerfile @@ -1,7 +1,7 @@ -FROM php:8.2.10-alpine +FROM php:8.2.11-alpine ARG PHP_XDEBUG_VERSION=3.2.2 -ARG COMPOSER_VERSION=2.6.2 +ARG COMPOSER_VERSION=2.6.4 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 \