From 9b3567274ce1dcb458c09e296af5f3b11c82840e Mon Sep 17 00:00:00 2001 From: Demin Yin Date: Fri, 11 Oct 2024 23:06:41 -0700 Subject: [PATCH] upgrades to Swoole 4.8.13 images List of upgrades: * Upgraded Composer to 2.8.1. * Upgraded to latest PHP 8.1 and 8.2 releases. * Alpine images are built with Alpine Linux 3.20 for PHP 8.1 and PHP 8.2. credit: PR #52 by vs0uz4 --- CHANGELOG.md | 3 ++- config/4.8.13.yml | 6 +++--- dockerfiles/4.8.13/php7.2/alpine/Dockerfile | 2 +- dockerfiles/4.8.13/php7.2/cli/Dockerfile | 2 +- dockerfiles/4.8.13/php7.3/alpine/Dockerfile | 2 +- dockerfiles/4.8.13/php7.3/cli/Dockerfile | 2 +- dockerfiles/4.8.13/php7.4/alpine/Dockerfile | 2 +- dockerfiles/4.8.13/php7.4/cli/Dockerfile | 2 +- dockerfiles/4.8.13/php8.0/alpine/Dockerfile | 2 +- dockerfiles/4.8.13/php8.0/cli/Dockerfile | 2 +- dockerfiles/4.8.13/php8.1/alpine/Dockerfile | 4 ++-- dockerfiles/4.8.13/php8.1/cli/Dockerfile | 4 ++-- dockerfiles/4.8.13/php8.2/alpine/Dockerfile | 4 ++-- dockerfiles/4.8.13/php8.2/cli/Dockerfile | 4 ++-- src/Dockerfile.php | 4 ++-- 15 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aedb47b..cb2826d7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -65,7 +65,8 @@ Table of Contents ## 4.8.13 ### Changed -- Upgrade _Composer_ from 2.2.18 to 2.2.21. +- Upgrade _Composer_ from 2.2.18 to 2.8.1. +- Alpine images are built with Alpine Linux 3.20 for PHP 8.1 and PHP 8.2. ## 4.8.12 diff --git a/config/4.8.13.yml b/config/4.8.13.yml index 16fe07bf..bd214e29 100644 --- a/config/4.8.13.yml +++ b/config/4.8.13.yml @@ -7,11 +7,11 @@ php: - "7.3.33" - "7.4.33" - "8.0.28" - - "8.1.16" - - "8.2.3" + - "8.1.30" + - "8.2.24" image: composer: - version: "2.2.21" + version: "2.8.1" php_extensions: redis: version: "5.3.7" diff --git a/dockerfiles/4.8.13/php7.2/alpine/Dockerfile b/dockerfiles/4.8.13/php7.2/alpine/Dockerfile index 646c217a..b12a155b 100644 --- a/dockerfiles/4.8.13/php7.2/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php7.2/alpine/Dockerfile @@ -4,7 +4,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php7.2/cli/Dockerfile b/dockerfiles/4.8.13/php7.2/cli/Dockerfile index 348d0912..b7d5a971 100644 --- a/dockerfiles/4.8.13/php7.2/cli/Dockerfile +++ b/dockerfiles/4.8.13/php7.2/cli/Dockerfile @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/dockerfiles/4.8.13/php7.3/alpine/Dockerfile b/dockerfiles/4.8.13/php7.3/alpine/Dockerfile index 0a69b41e..8218cd90 100644 --- a/dockerfiles/4.8.13/php7.3/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php7.3/alpine/Dockerfile @@ -4,7 +4,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php7.3/cli/Dockerfile b/dockerfiles/4.8.13/php7.3/cli/Dockerfile index ba0f27e3..dc27f426 100644 --- a/dockerfiles/4.8.13/php7.3/cli/Dockerfile +++ b/dockerfiles/4.8.13/php7.3/cli/Dockerfile @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/dockerfiles/4.8.13/php7.4/alpine/Dockerfile b/dockerfiles/4.8.13/php7.4/alpine/Dockerfile index 8e6fb0d0..60b699e6 100644 --- a/dockerfiles/4.8.13/php7.4/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php7.4/alpine/Dockerfile @@ -4,7 +4,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php7.4/cli/Dockerfile b/dockerfiles/4.8.13/php7.4/cli/Dockerfile index 5764c1f4..d044e077 100644 --- a/dockerfiles/4.8.13/php7.4/cli/Dockerfile +++ b/dockerfiles/4.8.13/php7.4/cli/Dockerfile @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/dockerfiles/4.8.13/php8.0/alpine/Dockerfile b/dockerfiles/4.8.13/php8.0/alpine/Dockerfile index f95e6e99..fd3415a3 100644 --- a/dockerfiles/4.8.13/php8.0/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php8.0/alpine/Dockerfile @@ -4,7 +4,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php8.0/cli/Dockerfile b/dockerfiles/4.8.13/php8.0/cli/Dockerfile index c7a90c39..ab024bf1 100644 --- a/dockerfiles/4.8.13/php8.0/cli/Dockerfile +++ b/dockerfiles/4.8.13/php8.0/cli/Dockerfile @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/dockerfiles/4.8.13/php8.1/alpine/Dockerfile b/dockerfiles/4.8.13/php8.1/alpine/Dockerfile index af707b39..72b9dafe 100644 --- a/dockerfiles/4.8.13/php8.1/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php8.1/alpine/Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.1.16-cli-alpine3.16 +FROM php:8.1.30-cli-alpine3.20 RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php8.1/cli/Dockerfile b/dockerfiles/4.8.13/php8.1/cli/Dockerfile index 54bc2fac..7b08fda6 100644 --- a/dockerfiles/4.8.13/php8.1/cli/Dockerfile +++ b/dockerfiles/4.8.13/php8.1/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.1.16-cli +FROM php:8.1.30-cli ENV DEBIAN_FRONTEND noninteractive ENV TERM xterm-color @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/dockerfiles/4.8.13/php8.2/alpine/Dockerfile b/dockerfiles/4.8.13/php8.2/alpine/Dockerfile index c486515f..4719a49f 100644 --- a/dockerfiles/4.8.13/php8.2/alpine/Dockerfile +++ b/dockerfiles/4.8.13/php8.2/alpine/Dockerfile @@ -1,10 +1,10 @@ -FROM php:8.2.3-cli-alpine3.16 +FROM php:8.2.24-cli-alpine3.20 RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update --clean-backups 2.2.21 && \ + composer self-update --clean-backups 2.8.1 && \ apk update && \ apk add --no-cache libstdc++ && \ apk add --no-cache --virtual .build-deps $PHPIZE_DEPS curl-dev linux-headers openssl-dev pcre-dev pcre2-dev zlib-dev && \ diff --git a/dockerfiles/4.8.13/php8.2/cli/Dockerfile b/dockerfiles/4.8.13/php8.2/cli/Dockerfile index 5fa19043..addca490 100644 --- a/dockerfiles/4.8.13/php8.2/cli/Dockerfile +++ b/dockerfiles/4.8.13/php8.2/cli/Dockerfile @@ -1,4 +1,4 @@ -FROM php:8.2.3-cli +FROM php:8.2.24-cli ENV DEBIAN_FRONTEND noninteractive ENV TERM xterm-color @@ -12,7 +12,7 @@ RUN \ set -ex && \ curl -sfL https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer && \ chmod +x /usr/bin/composer && \ - composer self-update 2.2.21 && \ + composer self-update 2.8.1 && \ apt-get update && \ apt-get install -y \ libcurl4-openssl-dev \ diff --git a/src/Dockerfile.php b/src/Dockerfile.php index 3e7261fb..7c1ee44e 100644 --- a/src/Dockerfile.php +++ b/src/Dockerfile.php @@ -28,8 +28,8 @@ class Dockerfile '7.3' => '3.13', '7.4' => '3.15', '8.0' => '3.16', - '8.1' => '3.16', - '8.2' => '3.16', + '8.1' => '3.20', + '8.2' => '3.20', ]; protected string $basePath;