From 1ab15ef483758ce489a909d0bd65c1452d9efd24 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Sat, 4 Jul 2026 19:32:29 +0200 Subject: [PATCH 1/3] Moved mlocati/php-extension-installer to FROM so we get dependabot updates --- Dockerfile.tmpl | 7 +++++-- Taskfile.dist.yml | 2 +- apache/Dockerfile | 7 +++++-- fpm/Dockerfile | 7 +++++-- frankenphp/Dockerfile | 7 +++++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index cc7424a..eeed002 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 # check=error=true +# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags +FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer + # Latest version of {{ .image_label }}: {{ .image_url }} FROM {{ getenv "BASE_IMAGE" }} AS runtime @@ -30,7 +33,7 @@ ENV FRANKENPHP_CONFIG="" {{ end }} WORKDIR /var/www -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ apt-transport-https \ @@ -79,7 +82,7 @@ ARG XDEBUG_VERSION=3.5.3 # Latest version of pcov: https://packagist.org/packages/pecl/pcov ARG PCOV_VERSION=1.0.12 -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ vim \ diff --git a/Taskfile.dist.yml b/Taskfile.dist.yml index 1f93b08..51ca766 100644 --- a/Taskfile.dist.yml +++ b/Taskfile.dist.yml @@ -149,7 +149,7 @@ tasks: internal: true vars: BASE_IMAGE: - sh: awk '/^FROM / && !found { print $2; found=1 }' {{.VARIANT}}/Dockerfile + sh: awk '/^FROM .* AS runtime$/ { print $2; exit }' {{.VARIANT}}/Dockerfile cmds: - docker run --rm diff --git a/apache/Dockerfile b/apache/Dockerfile index 57b2022..2a3689a 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 # check=error=true +# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags +FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer + # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.7-apache-trixie AS runtime @@ -26,7 +29,7 @@ ARG PHP_AMQP_VERSION=2.2.0 WORKDIR /var/www -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ apt-transport-https \ @@ -73,7 +76,7 @@ ARG XDEBUG_VERSION=3.5.3 # Latest version of pcov: https://packagist.org/packages/pecl/pcov ARG PCOV_VERSION=1.0.12 -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ vim \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index 30f29e0..e19f450 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 # check=error=true +# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags +FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer + # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.7-fpm-trixie AS runtime @@ -26,7 +29,7 @@ ARG PHP_AMQP_VERSION=2.2.0 WORKDIR /var/www -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ apt-transport-https \ @@ -73,7 +76,7 @@ ARG XDEBUG_VERSION=3.5.3 # Latest version of pcov: https://packagist.org/packages/pecl/pcov ARG PCOV_VERSION=1.0.12 -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ vim \ diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index 210cfe0..a351003 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -1,6 +1,9 @@ # syntax=docker/dockerfile:1 # check=error=true +# Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags +FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer + # Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags FROM dunglas/frankenphp:1.12.4-php8.5.7-trixie AS runtime @@ -30,7 +33,7 @@ ENV FRANKENPHP_CONFIG="" WORKDIR /var/www -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ apt-transport-https \ @@ -78,7 +81,7 @@ ARG XDEBUG_VERSION=3.5.3 # Latest version of pcov: https://packagist.org/packages/pecl/pcov ARG PCOV_VERSION=1.0.12 -RUN --mount=type=bind,from=mlocati/php-extension-installer:2.11.9,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ +RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ apt-get update \ && apt-get install --assume-yes --no-install-recommends \ vim \ From 5ea8ca4b1b9dd6c00205adc42f878aecd772e4b3 Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Sat, 4 Jul 2026 19:33:01 +0200 Subject: [PATCH 2/3] Updated mlocati/php-extension-installer version --- Dockerfile.tmpl | 2 +- apache/Dockerfile | 2 +- fpm/Dockerfile | 2 +- frankenphp/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index eeed002..c16f8f7 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -2,7 +2,7 @@ # check=error=true # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags -FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer +FROM mlocati/php-extension-installer:2.11.12 AS php_extension_installer # Latest version of {{ .image_label }}: {{ .image_url }} FROM {{ getenv "BASE_IMAGE" }} AS runtime diff --git a/apache/Dockerfile b/apache/Dockerfile index 2a3689a..3ada7f4 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -2,7 +2,7 @@ # check=error=true # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags -FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer +FROM mlocati/php-extension-installer:2.11.12 AS php_extension_installer # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.7-apache-trixie AS runtime diff --git a/fpm/Dockerfile b/fpm/Dockerfile index e19f450..fac580d 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -2,7 +2,7 @@ # check=error=true # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags -FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer +FROM mlocati/php-extension-installer:2.11.12 AS php_extension_installer # Latest version of PHP base image: https://hub.docker.com/_/php/tags FROM php:8.5.7-fpm-trixie AS runtime diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index a351003..785998e 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -2,7 +2,7 @@ # check=error=true # Latest version of php-extension-installer: https://hub.docker.com/r/mlocati/php-extension-installer/tags -FROM mlocati/php-extension-installer:2.11.9 AS php_extension_installer +FROM mlocati/php-extension-installer:2.11.12 AS php_extension_installer # Latest version of FrankenPHP base image: https://hub.docker.com/r/dunglas/frankenphp/tags FROM dunglas/frankenphp:1.12.4-php8.5.7-trixie AS runtime From 605c7d855f66b87c3935da8e6a5798e2c69c2f6b Mon Sep 17 00:00:00 2001 From: Ilyes512 Date: Sat, 4 Jul 2026 19:38:21 +0200 Subject: [PATCH 3/3] Updated links from packagist to pecl --- Dockerfile.tmpl | 12 ++++++------ apache/Dockerfile | 12 ++++++------ fpm/Dockerfile | 12 ++++++------ frankenphp/Dockerfile | 12 ++++++------ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Dockerfile.tmpl b/Dockerfile.tmpl index c16f8f7..36ad127 100644 --- a/Dockerfile.tmpl +++ b/Dockerfile.tmpl @@ -18,13 +18,13 @@ ENV XDG_DATA_HOME=$XDG_DATA_HOME ARG XDG_CACHE_HOME=/cache ENV XDG_CACHE_HOME=$XDG_CACHE_HOME -# Latest version of event-extension: https://packagist.org/packages/osmanov/pecl-event +# Latest version of event-extension: https://pecl.php.net/package/event ARG PHP_EVENT_VERSION=3.1.4 -# Latest version of igbinary-extension: https://packagist.org/packages/igbinary/igbinary +# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.17RC1 -# Latest version of redis-extension: https://packagist.org/packages/phpredis/phpredis +# Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.3.0 -# Latest version of amqp-extension: https://packagist.org/packages/php-amqp/php-amqp +# Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.2.0 {{ if .is_frankenphp }} # Default to classic mode (no workers). To enable worker mode, set: @@ -77,9 +77,9 @@ FROM runtime AS builder ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive -# Latest version of Xdebug: https://packagist.org/packages/xdebug/xdebug +# Latest version of Xdebug: https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.5.3 -# Latest version of pcov: https://packagist.org/packages/pecl/pcov +# Latest version of pcov: https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ diff --git a/apache/Dockerfile b/apache/Dockerfile index 3ada7f4..4afec1b 100644 --- a/apache/Dockerfile +++ b/apache/Dockerfile @@ -18,13 +18,13 @@ ENV XDG_DATA_HOME=$XDG_DATA_HOME ARG XDG_CACHE_HOME=/cache ENV XDG_CACHE_HOME=$XDG_CACHE_HOME -# Latest version of event-extension: https://packagist.org/packages/osmanov/pecl-event +# Latest version of event-extension: https://pecl.php.net/package/event ARG PHP_EVENT_VERSION=3.1.4 -# Latest version of igbinary-extension: https://packagist.org/packages/igbinary/igbinary +# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.17RC1 -# Latest version of redis-extension: https://packagist.org/packages/phpredis/phpredis +# Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.3.0 -# Latest version of amqp-extension: https://packagist.org/packages/php-amqp/php-amqp +# Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.2.0 WORKDIR /var/www @@ -71,9 +71,9 @@ FROM runtime AS builder ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive -# Latest version of Xdebug: https://packagist.org/packages/xdebug/xdebug +# Latest version of Xdebug: https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.5.3 -# Latest version of pcov: https://packagist.org/packages/pecl/pcov +# Latest version of pcov: https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ diff --git a/fpm/Dockerfile b/fpm/Dockerfile index fac580d..037f513 100644 --- a/fpm/Dockerfile +++ b/fpm/Dockerfile @@ -18,13 +18,13 @@ ENV XDG_DATA_HOME=$XDG_DATA_HOME ARG XDG_CACHE_HOME=/cache ENV XDG_CACHE_HOME=$XDG_CACHE_HOME -# Latest version of event-extension: https://packagist.org/packages/osmanov/pecl-event +# Latest version of event-extension: https://pecl.php.net/package/event ARG PHP_EVENT_VERSION=3.1.4 -# Latest version of igbinary-extension: https://packagist.org/packages/igbinary/igbinary +# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.17RC1 -# Latest version of redis-extension: https://packagist.org/packages/phpredis/phpredis +# Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.3.0 -# Latest version of amqp-extension: https://packagist.org/packages/php-amqp/php-amqp +# Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.2.0 WORKDIR /var/www @@ -71,9 +71,9 @@ FROM runtime AS builder ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive -# Latest version of Xdebug: https://packagist.org/packages/xdebug/xdebug +# Latest version of Xdebug: https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.5.3 -# Latest version of pcov: https://packagist.org/packages/pecl/pcov +# Latest version of pcov: https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \ diff --git a/frankenphp/Dockerfile b/frankenphp/Dockerfile index 785998e..9f3a3f1 100644 --- a/frankenphp/Dockerfile +++ b/frankenphp/Dockerfile @@ -18,13 +18,13 @@ ENV XDG_DATA_HOME=$XDG_DATA_HOME ARG XDG_CACHE_HOME=/cache ENV XDG_CACHE_HOME=$XDG_CACHE_HOME -# Latest version of event-extension: https://packagist.org/packages/osmanov/pecl-event +# Latest version of event-extension: https://pecl.php.net/package/event ARG PHP_EVENT_VERSION=3.1.4 -# Latest version of igbinary-extension: https://packagist.org/packages/igbinary/igbinary +# Latest version of igbinary-extension: https://pecl.php.net/package/igbinary ARG PHP_IGBINARY_VERSION=3.2.17RC1 -# Latest version of redis-extension: https://packagist.org/packages/phpredis/phpredis +# Latest version of redis-extension: https://pecl.php.net/package/redis ARG PHP_REDIS_VERSION=6.3.0 -# Latest version of amqp-extension: https://packagist.org/packages/php-amqp/php-amqp +# Latest version of amqp-extension: https://pecl.php.net/package/amqp ARG PHP_AMQP_VERSION=2.2.0 # Default to classic mode (no workers). To enable worker mode, set: @@ -76,9 +76,9 @@ FROM runtime AS builder ARG TARGETARCH ARG DEBIAN_FRONTEND=noninteractive -# Latest version of Xdebug: https://packagist.org/packages/xdebug/xdebug +# Latest version of Xdebug: https://pecl.php.net/package/xdebug ARG XDEBUG_VERSION=3.5.3 -# Latest version of pcov: https://packagist.org/packages/pecl/pcov +# Latest version of pcov: https://pecl.php.net/package/pcov ARG PCOV_VERSION=1.0.12 RUN --mount=type=bind,from=php_extension_installer,source=/usr/bin/install-php-extensions,target=/usr/local/bin/install-php-extensions \