From a449b488318c35e4ecc305c92119b0b261227e18 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:46:05 +0200 Subject: [PATCH 1/6] Updated redis php extension --- apache/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 5e88eca..006d6ad 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -8,7 +8,7 @@ ARG PHP_EVENT_VERSION=3.1.4 # Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.16 # Latest version of redis-extension: https://pecl.php.net/package/redis -ARG PHP_REDIS_VERSION=6.1.0 +ARG PHP_REDIS_VERSION=6.2.0 # Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.1.2 diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 922c16e..1b478c9 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -8,7 +8,7 @@ ARG PHP_EVENT_VERSION=3.1.4 # Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.16 # Latest version of redis-extension: https://pecl.php.net/package/redis -ARG PHP_REDIS_VERSION=6.1.0 +ARG PHP_REDIS_VERSION=6.2.0 # Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.1.2 From 4a1a180f4309d9e0fde0455ea901e144b699722a Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:46:56 +0200 Subject: [PATCH 2/6] Updated php image version --- apache/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 006d6ad..0d8d902 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -1,5 +1,5 @@ # Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags -FROM php:8.4.4-apache-bookworm AS runtime +FROM php:8.4.5-apache-bookworm AS runtime ARG UNIQUE_ID_FOR_CACHEFROM=runtime diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 1b478c9..09e9b0a 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -1,5 +1,5 @@ # Latest version of PHP base image: https://hub.docker.com/_/php?tab=tags -FROM php:8.4.4-fpm-bookworm AS runtime +FROM php:8.4.5-fpm-bookworm AS runtime ARG UNIQUE_ID_FOR_CACHEFROM=runtime From e167bb77ba09a0afcf442f53a0aa86f4f4e44860 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:48:07 +0200 Subject: [PATCH 3/6] Updated xdebug php extension version --- apache/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 0d8d902..627236f 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -129,7 +129,7 @@ ARG PHIVE_VERSION=0.15.3 # Latest version of Composer: https://getcomposer.org/download ARG COMPOSER_VERSION=2.8.5 # Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug -ARG XDEBUG_VERSION=3.4.1 +ARG XDEBUG_VERSION=3.4.2 # Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 09e9b0a..5988e29 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -129,7 +129,7 @@ ARG PHIVE_VERSION=0.15.3 # Latest version of Composer: https://getcomposer.org/download ARG COMPOSER_VERSION=2.8.5 # Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug -ARG XDEBUG_VERSION=3.4.1 +ARG XDEBUG_VERSION=3.4.2 # Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 From 2faffef1a847fb5684b7ea307fb16974839be4ff Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:48:32 +0200 Subject: [PATCH 4/6] Updated composer version --- apache/Dockerfile | 2 +- fpm/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apache/Dockerfile b/apache/Dockerfile index 627236f..df8b48f 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -127,7 +127,7 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder # Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest ARG PHIVE_VERSION=0.15.3 # Latest version of Composer: https://getcomposer.org/download -ARG COMPOSER_VERSION=2.8.5 +ARG COMPOSER_VERSION=2.8.6 # Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.4.2 # Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 5988e29..5841c87 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -127,7 +127,7 @@ ARG UNIQUE_ID_FOR_CACHEFROM=builder # Latest version of Phive: https://api.github.com/repos/phar-io/phive/releases/latest ARG PHIVE_VERSION=0.15.3 # Latest version of Composer: https://getcomposer.org/download -ARG COMPOSER_VERSION=2.8.5 +ARG COMPOSER_VERSION=2.8.6 # Latest version of Xdebug: https://github.com/xdebug/xdebug/tags or https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.4.2 # Latest version of pcov: https://github.com/krakjoe/pcov/tags or https://pecl.php.net/package/pcov From 275ddb6a4dce3280001f930da54f2ab0805aab9a Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:54:41 +0200 Subject: [PATCH 5/6] Added and enabled memcached php extension --- apache/Dockerfile | 12 ++++++++++++ fpm/Dockerfile | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/apache/Dockerfile b/apache/Dockerfile index df8b48f..1f0832b 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -9,6 +9,8 @@ ARG PHP_EVENT_VERSION=3.1.4 ARG PHP_IGBINARY_VERSION=3.2.16 # Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.2.0 +# Latest version of memcached-extension: https://pecl.php.net/package/memcached +ARG PHP_MEMCACHED_VERSION=3.3.0 # Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.1.2 @@ -43,6 +45,9 @@ RUN apt-get update \ librabbitmq4 \ # Dependency of PHP xsl-extension libxslt1.1 \ + # Dependency of PHP memcached-extension + libmemcached11 \ + zlib1g \ # Install packages that are needed for building PHP extensions && apt-get install --assume-yes --no-install-recommends \ $PHPIZE_DEPS \ @@ -66,6 +71,9 @@ RUN apt-get update \ librabbitmq-dev \ # Dependency of PHP xsl-extension libxslt1-dev \ + # Dependency of PHP memcached-extension + libmemcached-dev \ + zlib1g-dev \ # Configure PHP gd-extension && docker-php-ext-configure gd \ --enable-gd \ @@ -90,11 +98,13 @@ RUN apt-get update \ # Optional dependency of PHP redis-extension && pecl install "igbinary-$PHP_IGBINARY_VERSION" \ && pecl install --configureoptions 'enable-redis-igbinary="yes"' "redis-$PHP_REDIS_VERSION" \ + && pecl install --configureoptions 'enable-memcached-igbinary="yes"' "memcached-$PHP_MEMCACHED_VERSION" \ && pecl install "amqp-$PHP_AMQP_VERSION" \ && docker-php-ext-enable --ini-name docker-php-ext-zz-custom.ini \ event \ igbinary \ redis \ + memcached \ amqp \ && cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ # Purge packages that where only needed for building php extensions @@ -111,6 +121,8 @@ RUN apt-get update \ libxml2-dev \ libpq-dev \ librabbitmq-dev \ + libmemcached-dev \ + zlib1g-dev \ # Cleanup && rm -rf /var/www/* \ && apt-get autoremove --assume-yes \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 5841c87..f412207 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -9,6 +9,8 @@ ARG PHP_EVENT_VERSION=3.1.4 ARG PHP_IGBINARY_VERSION=3.2.16 # Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.2.0 +# Latest version of memcached-extension: https://pecl.php.net/package/memcached +ARG PHP_MEMCACHED_VERSION=3.3.0 # Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.1.2 @@ -43,6 +45,9 @@ RUN apt-get update \ librabbitmq4 \ # Dependency of PHP xsl-extension libxslt1.1 \ + # Dependency of PHP memcached-extension + libmemcached11 \ + zlib1g \ # Install packages that are needed for building PHP extensions && apt-get install --assume-yes --no-install-recommends \ $PHPIZE_DEPS \ @@ -66,6 +71,9 @@ RUN apt-get update \ librabbitmq-dev \ # Dependency of PHP xsl-extension libxslt1-dev \ + # Dependency of PHP memcached-extension + libmemcached-dev \ + zlib1g-dev \ # Configure PHP gd-extension && docker-php-ext-configure gd \ --enable-gd \ @@ -90,11 +98,13 @@ RUN apt-get update \ # Optional dependency of PHP redis-extension && pecl install "igbinary-$PHP_IGBINARY_VERSION" \ && pecl install --configureoptions 'enable-redis-igbinary="yes"' "redis-$PHP_REDIS_VERSION" \ + && pecl install --configureoptions 'enable-memcached-igbinary="yes"' "memcached-$PHP_MEMCACHED_VERSION" \ && pecl install "amqp-$PHP_AMQP_VERSION" \ && docker-php-ext-enable --ini-name docker-php-ext-zz-custom.ini \ event \ igbinary \ redis \ + memcached \ amqp \ && cp "$PHP_INI_DIR/php.ini-production" "$PHP_INI_DIR/php.ini" \ # Purge packages that where only needed for building php extensions @@ -111,6 +121,8 @@ RUN apt-get update \ libxml2-dev \ libpq-dev \ librabbitmq-dev \ + libmemcached-dev \ + zlib1g-dev \ # Cleanup && rm -rf /var/www/* \ && apt-get autoremove --assume-yes \ From d1758e54e4e0882a5787054701e540f282a3f595 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Tue, 1 Apr 2025 19:55:31 +0200 Subject: [PATCH 6/6] Updated github-actions workflow version --- .github/workflows/main.yml | 4 ++-- .github/workflows/pr.yml | 4 ++-- .github/workflows/tag.yml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 66e23f9..0627e1a 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -15,7 +15,7 @@ concurrency: jobs: build: - uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3 strategy: fail-fast: false matrix: @@ -36,7 +36,7 @@ jobs: dockerfile: ${{ matrix.docker.dockerfile }} merge: - uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3 needs: build strategy: matrix: diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index fa0cb8a..d595b6c 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -14,7 +14,7 @@ concurrency: jobs: build: - uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3 strategy: fail-fast: false matrix: @@ -35,7 +35,7 @@ jobs: dockerfile: ${{ matrix.docker.dockerfile }} merge: - uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3 needs: build strategy: matrix: diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 5d8ae2a..debb33c 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -15,7 +15,7 @@ concurrency: jobs: build: - uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/build-php.yml@1.0.3 strategy: fail-fast: false matrix: @@ -36,7 +36,7 @@ jobs: dockerfile: ${{ matrix.docker.dockerfile }} merge: - uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.2 + uses: Ilyes512/github-actions/.github/workflows/merge-php.yml@1.0.3 needs: build strategy: matrix: