From c7294b24090bee27ecc496c745763060cc51cd08 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Fri, 29 Aug 2025 21:46:01 -0500 Subject: [PATCH 01/10] Update 8.3 and 8.4 images to Debian Trixie --- images/8.3-apache/Dockerfile | 4 ++-- images/8.3-fpm/Dockerfile | 4 ++-- images/8.4-apache/Dockerfile | 4 ++-- images/8.4-fpm/Dockerfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index 80e5b35..af924c3 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -1,6 +1,6 @@ -# docker build -t devwithlando/php:8.3-apache-5 . +# docker build -t devwithlando/php:8.3-apache-6 . -FROM php:8.3-apache-bookworm +FROM php:8.3-apache-trixie ARG TARGETARCH diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index de452ee..1d653eb 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -1,6 +1,6 @@ -# docker build -t devwithlando/php:8.3-fpm-5 . +# docker build -t devwithlando/php:8.3-fpm-6 . -FROM php:8.3-fpm-bookworm +FROM php:8.3-fpm-trixie ARG TARGETARCH diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index 3f7ceab..3701ad3 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -1,6 +1,6 @@ -# docker build -t devwithlando/php:8.4-apache-5 . +# docker build -t devwithlando/php:8.4-apache-6 . -FROM php:8.4-apache-bookworm +FROM php:8.4-apache-trixie ARG TARGETARCH diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index 0ccb700..548be3a 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -1,6 +1,6 @@ -# docker build -t devwithlando/php:8.4-fpm-5 . +# docker build -t devwithlando/php:8.4-fpm-6 . -FROM php:8.4-fpm-bookworm +FROM php:8.4-fpm-trixie ARG TARGETARCH From 6470e77d2e9561c655e463bb13f911b4172e1fa2 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Sat, 30 Aug 2025 20:09:52 -0500 Subject: [PATCH 02/10] adjust packages for trixie --- images/8.3-apache/Dockerfile | 26 ++++++-------------------- images/8.3-fpm/Dockerfile | 25 +++++-------------------- images/8.4-apache/Dockerfile | 24 ++++-------------------- images/8.4-fpm/Dockerfile | 24 ++++-------------------- 4 files changed, 19 insertions(+), 80 deletions(-) diff --git a/images/8.3-apache/Dockerfile b/images/8.3-apache/Dockerfile index af924c3..e6bf9ed 100644 --- a/images/8.3-apache/Dockerfile +++ b/images/8.3-apache/Dockerfile @@ -6,36 +6,22 @@ ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ - postgresql-client-15 \ + mariadb-client \ + mariadb-client-compat \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ diff --git a/images/8.3-fpm/Dockerfile b/images/8.3-fpm/Dockerfile index 1d653eb..d90ca19 100644 --- a/images/8.3-fpm/Dockerfile +++ b/images/8.3-fpm/Dockerfile @@ -6,37 +6,22 @@ ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.11/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ mariadb-client \ - postgresql-client-15 \ + mariadb-client-compat \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ diff --git a/images/8.4-apache/Dockerfile b/images/8.4-apache/Dockerfile index 3701ad3..b0732d3 100644 --- a/images/8.4-apache/Dockerfile +++ b/images/8.4-apache/Dockerfile @@ -6,38 +6,22 @@ ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ mariadb-client \ mariadb-client-compat \ - postgresql-client-15 \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ diff --git a/images/8.4-fpm/Dockerfile b/images/8.4-fpm/Dockerfile index 548be3a..3dfdc7f 100644 --- a/images/8.4-fpm/Dockerfile +++ b/images/8.4-fpm/Dockerfile @@ -6,39 +6,23 @@ ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ bzip2 \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ mariadb-client \ mariadb-client-compat \ - postgresql-client-15 \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ From 3093cf4649955c3c014e5e3f5e19ac7c0893c064 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Wed, 26 Nov 2025 17:02:33 -0600 Subject: [PATCH 03/10] update 8.5 image to trixie --- CHANGELOG.md | 1 + images/8.5-apache/Dockerfile | 28 ++++++---------------------- images/8.5-fpm/Dockerfile | 28 ++++++---------------------- 3 files changed, 13 insertions(+), 44 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 23f3e8d..29a3868 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) * Added support for PHP 8.5 +* Updated PHP 8.3-8.5 base images to Debian 13 (trixie) ## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0) diff --git a/images/8.5-apache/Dockerfile b/images/8.5-apache/Dockerfile index 280ccbd..914294c 100644 --- a/images/8.5-apache/Dockerfile +++ b/images/8.5-apache/Dockerfile @@ -1,43 +1,27 @@ -# docker buildx build -t devwithlando/php:8.5-apache-5 . +# docker buildx build -t devwithlando/php:8.5-apache-6 . -FROM php:8.5-apache-bookworm +FROM php:8.5-apache-trixie ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ mariadb-client \ mariadb-client-compat \ - postgresql-client-15 \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ diff --git a/images/8.5-fpm/Dockerfile b/images/8.5-fpm/Dockerfile index a74be32..5a2710a 100644 --- a/images/8.5-fpm/Dockerfile +++ b/images/8.5-fpm/Dockerfile @@ -1,44 +1,28 @@ -# docker buildx build -t devwithlando/php:8.5-fpm-5 . +# docker buildx build -t devwithlando/php:8.5-fpm-6 . -FROM php:8.5-fpm-bookworm +FROM php:8.5-fpm-trixie ARG TARGETARCH ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/ -RUN \ - # MariaDB client compatibility (https://github.com/lando/php/issues/120) - mkdir -p /etc/apt/keyrings \ - && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/11.4/debian bookworm main" > /etc/apt/sources.list.d/mariadb.list - -# Drupal 11 requires sqlite3 3.45+ -ARG SQLITE_VERSION=3.45.1 -RUN \ - curl -Lo /tmp/sqlite3.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/sqlite3_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-0.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-0_${SQLITE_VERSION}-1_${TARGETARCH}.deb" \ - && curl -Lo /tmp/libsqlite3-dev.deb "https://snapshot.debian.org/archive/debian/20240506T211830Z/pool/main/s/sqlite3/libsqlite3-dev_${SQLITE_VERSION}-1_${TARGETARCH}.deb" - RUN \ mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ bzip2 \ default-mysql-client \ - exiftool \ - git-core \ + libimage-exiftool-perl \ + git \ gnupg2 \ imagemagick \ mariadb-client \ mariadb-client-compat \ - postgresql-client-15 \ + postgresql-client-17 \ pv \ rsync \ ssh \ unzip \ - wget \ - /tmp/sqlite3.deb \ - /tmp/libsqlite3-0.deb \ - /tmp/libsqlite3-dev.deb + wget RUN \ install-php-extensions @fix_letsencrypt \ From 88930ec5d7b545f93b41836253182d22df8c6a42 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Sat, 29 Nov 2025 19:52:08 -0600 Subject: [PATCH 04/10] changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29a3868..4bf06a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ ## {{ UNRELEASED_VERSION }} - [{{ UNRELEASED_DATE }}]({{ UNRELEASED_LINK }}) * Added support for PHP 8.5 -* Updated PHP 8.3-8.5 base images to Debian 13 (trixie) +* Added Debian 13 (trixie) base images for PHP 8.3-8.5 ## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0) From d9115970442148127e7ea99235331162f5c05f1b Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 14:13:49 -0600 Subject: [PATCH 05/10] use mariadb archive repo for old versions --- images/7.4-apache/Dockerfile | 2 +- images/7.4-fpm/Dockerfile | 2 +- images/8.0-apache/Dockerfile | 2 +- images/8.0-fpm/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index 47b27f4..7b55aa7 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -8,7 +8,7 @@ RUN \ # MariaDB client compatibility (https://github.com/lando/php/issues/120) mkdir -p /etc/apt/keyrings \ && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list + && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index 7a6d281..bf6d9d5 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -8,7 +8,7 @@ RUN \ # MariaDB client compatibility (https://github.com/lando/php/issues/120) mkdir -p /etc/apt/keyrings \ && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list + && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 32368e3..55471a2 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -8,7 +8,7 @@ RUN \ # MariaDB client compatibility (https://github.com/lando/php/issues/120) mkdir -p /etc/apt/keyrings \ && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list + && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index 63456c9..f06c325 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -8,7 +8,7 @@ RUN \ # MariaDB client compatibility (https://github.com/lando/php/issues/120) mkdir -p /etc/apt/keyrings \ && curl -o /etc/apt/keyrings/mariadb-keyring.pgp 'https://mariadb.org/mariadb_release_signing_key.pgp' \ - && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://mirror.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list + && echo "deb [signed-by=/etc/apt/keyrings/mariadb-keyring.pgp] https://archive.mariadb.org/repo/10.5/debian bullseye main" > /etc/apt/sources.list.d/mariadb.list RUN mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ && apt -y update && apt-get install -y \ From bac00df142fd0e4f5fd525c8d7707978a3c2ddb0 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 17:53:28 -0600 Subject: [PATCH 06/10] stretch images need updated archive keyring --- images/5.6-apache/Dockerfile | 12 ++++++++---- images/5.6-fpm/Dockerfile | 12 ++++++++---- images/7.0-apache/Dockerfile | 12 ++++++++---- images/7.0-fpm/Dockerfile | 12 ++++++++---- 4 files changed, 32 insertions(+), 16 deletions(-) diff --git a/images/5.6-apache/Dockerfile b/images/5.6-apache/Dockerfile index 9a6516a..a608ad5 100644 --- a/images/5.6-apache/Dockerfile +++ b/images/5.6-apache/Dockerfile @@ -1,15 +1,19 @@ -# docker build -t devwithlando/php:5.6-apache-5 . +# docker build -t devwithlando/php:5.6-apache-6 . FROM php:5.6-apache-stretch -# Install dependencies we need +# Debian Stretch has archived repositories and expired keys RUN \ sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \ && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \ && sed -i '/stretch-updates/d' /etc/apt/sources.list \ && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \ - && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt -y update && apt-get install -y \ + && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring + +# Install dependencies +RUN \ + apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/5.6-fpm/Dockerfile b/images/5.6-fpm/Dockerfile index 412c0fa..062b1ee 100644 --- a/images/5.6-fpm/Dockerfile +++ b/images/5.6-fpm/Dockerfile @@ -1,15 +1,19 @@ -# docker build -t devwithlando/php:5.6-fpm-5 . +# docker build -t devwithlando/php:5.6-fpm-6 . FROM php:5.6-fpm-stretch -# Install dependencies we need +# Debian Stretch has archived repositories and expired keys RUN \ sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \ && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \ && sed -i '/stretch-updates/d' /etc/apt/sources.list \ && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \ - && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt -y update && apt-get install -y \ + && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring + +# Install dependencies +RUN \ + apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/7.0-apache/Dockerfile b/images/7.0-apache/Dockerfile index bb96884..cbf5770 100644 --- a/images/7.0-apache/Dockerfile +++ b/images/7.0-apache/Dockerfile @@ -1,15 +1,19 @@ -# docker build -t devwithlando/php:7.0-apache-5 . +# docker build -t devwithlando/php:7.0-apache-6 . FROM php:7.0-apache-stretch -# Install dependencies we need +# Debian Stretch has archived repositories and expired keys RUN \ sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \ && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \ && sed -i '/stretch-updates/d' /etc/apt/sources.list \ && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \ - && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt -y update && apt-get install -y \ + && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring + +# Install dependencies +RUN \ + apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/7.0-fpm/Dockerfile b/images/7.0-fpm/Dockerfile index 4ed89d1..9b50d56 100644 --- a/images/7.0-fpm/Dockerfile +++ b/images/7.0-fpm/Dockerfile @@ -1,15 +1,19 @@ -# docker build -t devwithlando/php:7.0-fpm-5 . +# docker build -t devwithlando/php:7.0-fpm-6 . FROM php:7.0-fpm-stretch -# Install dependencies we need +# Debian Stretch has archived repositories and expired keys RUN \ sed -i 's/deb.debian.org/archive.debian.org/g' /etc/apt/sources.list \ && sed -i 's|security.debian.org|archive.debian.org/|g' /etc/apt/sources.list \ && sed -i '/stretch-updates/d' /etc/apt/sources.list \ && echo 'Acquire::Check-Valid-Until "false";' > /etc/apt/apt.conf.d/99ignore-release-date \ - && mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ - && apt -y update && apt-get install -y \ + && apt-get -qq update -o Acquire::AllowInsecureRepositories=true -o Acquire::AllowDowngradeToInsecureRepositories=true -o APT::Get::AllowUnauthenticated=true \ + && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends --no-install-suggests -o APT::Get::AllowUnauthenticated=true debian-archive-keyring + +# Install dependencies +RUN \ + apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ From 5b817d121982aa54547c61fd0f35e71059ad2f61 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 17:58:58 -0600 Subject: [PATCH 07/10] tag v6 images --- .github/workflows/build-php-images.yml | 48 +++++++++++++------------- CHANGELOG.md | 2 ++ images/7.1-apache/Dockerfile | 2 +- images/7.1-fpm/Dockerfile | 2 +- images/7.2-apache/Dockerfile | 2 +- images/7.2-fpm/Dockerfile | 2 +- images/7.3-apache/Dockerfile | 2 +- images/7.3-fpm/Dockerfile | 2 +- images/7.4-apache/Dockerfile | 2 +- images/7.4-fpm/Dockerfile | 2 +- images/8.0-apache/Dockerfile | 2 +- images/8.0-fpm/Dockerfile | 2 +- images/8.1-apache/Dockerfile | 2 +- images/8.1-fpm/Dockerfile | 2 +- images/8.2-apache/Dockerfile | 2 +- images/8.2-fpm/Dockerfile | 2 +- 16 files changed, 40 insertions(+), 38 deletions(-) diff --git a/.github/workflows/build-php-images.yml b/.github/workflows/build-php-images.yml index c9a6eb4..89f2aeb 100644 --- a/.github/workflows/build-php-images.yml +++ b/.github/workflows/build-php-images.yml @@ -23,76 +23,76 @@ jobs: matrix: include: - image: php - tag: 8.5-fpm-5 + tag: 8.5-fpm-6 context: images/8.5-fpm - image: php - tag: 8.5-apache-5 + tag: 8.5-apache-6 context: images/8.5-apache - image: php - tag: 8.4-fpm-5 + tag: 8.4-fpm-6 context: images/8.4-fpm - image: php - tag: 8.4-apache-5 + tag: 8.4-apache-6 context: images/8.4-apache - image: php - tag: 8.3-fpm-5 + tag: 8.3-fpm-6 context: images/8.3-fpm - image: php - tag: 8.3-apache-5 + tag: 8.3-apache-6 context: images/8.3-apache - image: php - tag: 8.2-fpm-5 + tag: 8.2-fpm-6 context: images/8.2-fpm - image: php - tag: 8.2-apache-5 + tag: 8.2-apache-6 context: images/8.2-apache - image: php - tag: 8.1-fpm-5 + tag: 8.1-fpm-6 context: images/8.1-fpm - image: php - tag: 8.1-apache-5 + tag: 8.1-apache-6 context: images/8.1-apache - image: php - tag: 8.0-fpm-5 + tag: 8.0-fpm-6 context: images/8.0-fpm - image: php - tag: 8.0-apache-5 + tag: 8.0-apache-6 context: images/8.0-apache - image: php - tag: 7.4-fpm-5 + tag: 7.4-fpm-6 context: images/7.4-fpm - image: php - tag: 7.4-apache-5 + tag: 7.4-apache-6 context: images/7.4-apache - image: php - tag: 7.3-fpm-5 + tag: 7.3-fpm-6 context: images/7.3-fpm - image: php - tag: 7.3-apache-5 + tag: 7.3-apache-6 context: images/7.3-apache - image: php - tag: 7.2-fpm-5 + tag: 7.2-fpm-6 context: images/7.2-fpm - image: php - tag: 7.2-apache-5 + tag: 7.2-apache-6 context: images/7.2-apache - image: php - tag: 7.1-fpm-5 + tag: 7.1-fpm-6 context: images/7.1-fpm - image: php - tag: 7.1-apache-5 + tag: 7.1-apache-6 context: images/7.1-apache - image: php - tag: 7.0-fpm-5 + tag: 7.0-fpm-6 context: images/7.0-fpm - image: php - tag: 7.0-apache-5 + tag: 7.0-apache-6 context: images/7.0-apache - image: php - tag: 5.6-fpm-5 + tag: 5.6-fpm-6 context: images/5.6-fpm - image: php - tag: 5.6-apache-5 + tag: 5.6-apache-6 context: images/5.6-apache steps: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bf06a9..3fc235b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ * Added support for PHP 8.5 * Added Debian 13 (trixie) base images for PHP 8.3-8.5 +* Changed PHP 7.4 and 8.0 images to use MariaDB `archive.mariadb.org` apt repository +* Fixed expired keys preventing stretch-based images from building ## v1.8.0 - [September 2, 2025](https://github.com/lando/php/releases/tag/v1.8.0) diff --git a/images/7.1-apache/Dockerfile b/images/7.1-apache/Dockerfile index 1f6eedf..3590ff4 100644 --- a/images/7.1-apache/Dockerfile +++ b/images/7.1-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.1-apache-5 . +# docker build -t devwithlando/php:7.1-apache-6 . FROM php:7.1-apache-buster diff --git a/images/7.1-fpm/Dockerfile b/images/7.1-fpm/Dockerfile index d015777..97d16f7 100644 --- a/images/7.1-fpm/Dockerfile +++ b/images/7.1-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.1-fpm-5 . +# docker build -t devwithlando/php:7.1-fpm-6 . FROM php:7.1-fpm-buster diff --git a/images/7.2-apache/Dockerfile b/images/7.2-apache/Dockerfile index e30bd8e..0d6b246 100644 --- a/images/7.2-apache/Dockerfile +++ b/images/7.2-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.2-apache-5 . +# docker build -t devwithlando/php:7.2-apache-6 . FROM php:7.2-apache-buster diff --git a/images/7.2-fpm/Dockerfile b/images/7.2-fpm/Dockerfile index b6338c8..f9e0fdd 100644 --- a/images/7.2-fpm/Dockerfile +++ b/images/7.2-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.2-fpm-5 . +# docker build -t devwithlando/php:7.2-fpm-6 . FROM php:7.2-fpm-buster diff --git a/images/7.3-apache/Dockerfile b/images/7.3-apache/Dockerfile index add1cb5..8324505 100644 --- a/images/7.3-apache/Dockerfile +++ b/images/7.3-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.3-apache-5 . +# docker build -t devwithlando/php:7.3-apache-6 . FROM php:7.3-apache-bullseye diff --git a/images/7.3-fpm/Dockerfile b/images/7.3-fpm/Dockerfile index ced55e9..6a89972 100644 --- a/images/7.3-fpm/Dockerfile +++ b/images/7.3-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.3-fpm-5 . +# docker build -t devwithlando/php:7.3-fpm-6 . FROM php:7.3-fpm-bullseye diff --git a/images/7.4-apache/Dockerfile b/images/7.4-apache/Dockerfile index 7b55aa7..7dfd782 100644 --- a/images/7.4-apache/Dockerfile +++ b/images/7.4-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.4-apache-5 . +# docker build -t devwithlando/php:7.4-apache-6 . FROM php:7.4-apache-bullseye diff --git a/images/7.4-fpm/Dockerfile b/images/7.4-fpm/Dockerfile index bf6d9d5..6c949e1 100644 --- a/images/7.4-fpm/Dockerfile +++ b/images/7.4-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:7.4-fpm-5 . +# docker build -t devwithlando/php:7.4-fpm-6 . FROM php:7.4-fpm-bullseye diff --git a/images/8.0-apache/Dockerfile b/images/8.0-apache/Dockerfile index 55471a2..ad23aae 100644 --- a/images/8.0-apache/Dockerfile +++ b/images/8.0-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.0-apache-5 . +# docker build -t devwithlando/php:8.0-apache-6 . FROM php:8.0-apache-bullseye diff --git a/images/8.0-fpm/Dockerfile b/images/8.0-fpm/Dockerfile index f06c325..c0dc873 100644 --- a/images/8.0-fpm/Dockerfile +++ b/images/8.0-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.0-fpm-5 . +# docker build -t devwithlando/php:8.0-fpm-6 . FROM php:8.0-fpm-bullseye diff --git a/images/8.1-apache/Dockerfile b/images/8.1-apache/Dockerfile index ff0108b..3c82274 100644 --- a/images/8.1-apache/Dockerfile +++ b/images/8.1-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.1-apache-5 . +# docker build -t devwithlando/php:8.1-apache-6 . FROM php:8.1-apache-bookworm diff --git a/images/8.1-fpm/Dockerfile b/images/8.1-fpm/Dockerfile index b420667..597c86b 100644 --- a/images/8.1-fpm/Dockerfile +++ b/images/8.1-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.1-fpm-5 . +# docker build -t devwithlando/php:8.1-fpm-6 . FROM php:8.1-fpm-bookworm diff --git a/images/8.2-apache/Dockerfile b/images/8.2-apache/Dockerfile index 6d5a0cb..6f7ae4a 100644 --- a/images/8.2-apache/Dockerfile +++ b/images/8.2-apache/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.2-apache-5 . +# docker build -t devwithlando/php:8.2-apache-6 . FROM php:8.2-apache-bookworm diff --git a/images/8.2-fpm/Dockerfile b/images/8.2-fpm/Dockerfile index 2258c8c..5ccdec0 100644 --- a/images/8.2-fpm/Dockerfile +++ b/images/8.2-fpm/Dockerfile @@ -1,4 +1,4 @@ -# docker build -t devwithlando/php:8.2-fpm-5 . +# docker build -t devwithlando/php:8.2-fpm-6 . FROM php:8.2-fpm-bookworm From 7108ee8076725cfb0d9c6a55b16e252068b52a0d Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 18:32:44 -0600 Subject: [PATCH 08/10] use v6 images by default --- builders/php.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builders/php.js b/builders/php.js index f79ef6e..7c43a6c 100644 --- a/builders/php.js +++ b/builders/php.js @@ -163,7 +163,7 @@ module.exports = { }, scriptsDir: path.resolve(__dirname, '..', 'scripts'), sources: [], - suffix: '5', + suffix: '6', ssl: false, via: 'apache', volumes: ['/usr/local/bin'], From 73ed7509272b4de7b47ed747aeeef9d88fc1e63c Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 18:47:08 -0600 Subject: [PATCH 09/10] return of the man --- images/5.6-apache/Dockerfile | 3 ++- images/5.6-fpm/Dockerfile | 3 ++- images/7.0-apache/Dockerfile | 3 ++- images/7.0-fpm/Dockerfile | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/images/5.6-apache/Dockerfile b/images/5.6-apache/Dockerfile index a608ad5..a0d3c54 100644 --- a/images/5.6-apache/Dockerfile +++ b/images/5.6-apache/Dockerfile @@ -13,7 +13,8 @@ RUN \ # Install dependencies RUN \ - apt-get update && apt-get install -y \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/5.6-fpm/Dockerfile b/images/5.6-fpm/Dockerfile index 062b1ee..56ca53a 100644 --- a/images/5.6-fpm/Dockerfile +++ b/images/5.6-fpm/Dockerfile @@ -13,7 +13,8 @@ RUN \ # Install dependencies RUN \ - apt-get update && apt-get install -y \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/7.0-apache/Dockerfile b/images/7.0-apache/Dockerfile index cbf5770..e152eff 100644 --- a/images/7.0-apache/Dockerfile +++ b/images/7.0-apache/Dockerfile @@ -13,7 +13,8 @@ RUN \ # Install dependencies RUN \ - apt-get update && apt-get install -y \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ diff --git a/images/7.0-fpm/Dockerfile b/images/7.0-fpm/Dockerfile index 9b50d56..2a540cb 100644 --- a/images/7.0-fpm/Dockerfile +++ b/images/7.0-fpm/Dockerfile @@ -13,7 +13,8 @@ RUN \ # Install dependencies RUN \ - apt-get update && apt-get install -y \ + mkdir -p /usr/share/man/man1 /usr/share/man/man7 \ + && apt-get update && apt-get install -y \ gnupg2 \ wget \ bzip2 \ From c3a0ec684fa486f227eade7ef59de40c632930f3 Mon Sep 17 00:00:00 2001 From: Aaron Feledy Date: Mon, 1 Dec 2025 20:29:40 -0600 Subject: [PATCH 10/10] todo hub.docker.com links --- netlify.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/netlify.toml b/netlify.toml index a46e45e..e8a287e 100644 --- a/netlify.toml +++ b/netlify.toml @@ -10,7 +10,7 @@ [[context.deploy-preview.plugins]] package = "netlify-plugin-checklinks" [context.deploy-preview.plugins.inputs] - todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net" ] + todoPatterns = [ "load", "CHANGELOG.html", "/v/", "x.com", "twitter.com", "www.php.net", "hub.docker.com" ] skipPatterns = [ ".rss", ".gif", ".jpg" ] checkExternal = true