From 61fc01f27ddbb807f066715d9a2cc5bfee3ea345 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:34:01 +0100
Subject: [PATCH 01/18] ci: build with kaniko

---
 .woodpecker/.build.yml | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 635d11a..657a37d 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -10,15 +10,17 @@ matrix:
 
 steps:
   docker:
-    image: docker:dind
+    image: gcr.io/kaniko-project/executor:latest
     secrets: [registry_user, registry_password, registry_docker_password]
     commands:
-      - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr
-      - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin
-      - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" .
-      - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION"
-      - docker push "gitnet.fr/deblan/php:$PHP_VERSION"
-      - docker push "deblan/php:$PHP_VERSION"
+      # - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr
+      # - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin
+      # - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" .
+      # - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION"
+      # - docker push "gitnet.fr/deblan/php:$PHP_VERSION"
+      # - docker push "deblan/php:$PHP_VERSION"
+      - /kaniko/executor --no-push --context $CI_WORKSPACE --dockerfile "./Dockerfile.php$PHP_VERSION" --destination "gitnet.fr/deblan/php:$PHP_VERSION"
+      - /kaniko/executor --no-push --context $CI_WORKSPACE --dockerfile "./Dockerfile.php$PHP_VERSION" --destination "deblan/php:$PHP_VERSION"
     volumes:
       - /var/run/docker.sock:/var/run/docker.sock
     when:

From 2bcf2fa4db1cfafd3fe7b4eed4cb47e536fcef38 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:35:53 +0100
Subject: [PATCH 02/18] ci: build with kaniko

---
 .woodpecker/.build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 657a37d..619156f 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -25,7 +25,8 @@ steps:
       - /var/run/docker.sock:/var/run/docker.sock
     when:
       - event: cron
-      - branch: [master]
+      - branch: [feature/kaniko]
+      #- branch: [master]
 
   mail:
     image: deblan/woodpecker-email

From d5468a5bb9666ef5bd06e38c4a0e87607c89ed22 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Tue, 26 Dec 2023 17:42:59 +0100
Subject: [PATCH 03/18] ci: build with kaniko

---
 .woodpecker/.build.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 619156f..28432b8 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -10,7 +10,7 @@ matrix:
 
 steps:
   docker:
-    image: gcr.io/kaniko-project/executor:latest
+    image: gcr.io/kaniko-project/executor:debug
     secrets: [registry_user, registry_password, registry_docker_password]
     commands:
       # - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr

From f1b9d3a0557cda2d259cabd27ed62b4f9d2589ca Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 15 Jan 2024 12:58:15 +0100
Subject: [PATCH 04/18] update ci

---
 .woodpecker/.build.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 635d11a..7182787 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -28,15 +28,10 @@ steps:
   mail:
     image: deblan/woodpecker-email
     settings:
-      host:
-        from_secret: mail_host
-      username:
-        from_secret: mail_username
-      password:
-        from_secret: mail_password
+      dsn:
+        from_secret: mail_dsn
       from:
-        from_secret: mail_from
-      subject: "[{{ repo.owner }}/{{ repo.name }}] Pipeline #{{ build.number }}: {{ build.status }}"
+        address:
+          from_secret: mail_from
     when:
-      - event: cron
-      - status: [success, failure]
+      status: [success, failure]

From 30cd9f6149194662d4d1ff97bc636545b04eacda Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Mon, 15 Jan 2024 13:36:16 +0100
Subject: [PATCH 05/18] update ci

---
 .woodpecker/.build.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 7182787..2ffa586 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -33,5 +33,8 @@ steps:
       from:
         address:
           from_secret: mail_from
+      recipients:
+          from_secret: mail_to
+      recipients_only: true
     when:
       status: [success, failure]

From fe3044565612cb8ccd21bdde6dad2db1f7f6c352 Mon Sep 17 00:00:00 2001
From: Renovate Bot <revonate@gitnet.fr>
Date: Sat, 27 Jan 2024 22:59:13 +0000
Subject: [PATCH 06/18] chore(deps): add renovate.json

---
 renovate.json | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 renovate.json

diff --git a/renovate.json b/renovate.json
new file mode 100644
index 0000000..7190a60
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,3 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json"
+}

From ded5fa6dcde0252ca6d8e7388ee4874011cc521d Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 1 Mar 2024 11:46:21 +0100
Subject: [PATCH 07/18] update composer hash

---
 Dockerfile.php7.1 | 2 +-
 Dockerfile.php7.3 | 2 +-
 Dockerfile.php7.4 | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile.php7.1 b/Dockerfile.php7.1
index ddeff1c..0c035e0 100644
--- a/Dockerfile.php7.1
+++ b/Dockerfile.php7.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.1 php7.1-apcu php7.1-apcu-bc php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-common php7.1-curl php7.1-fpm php7.1-gd php7.1-gmp php7.1-http php7.1-igbinary php7.1-imagick php7.1-imap php7.1-intl php7.1-json php7.1-mailparse php7.1-mbstring php7.1-memcached php7.1-mongodb php7.1-msgpack php7.1-mysql php7.1-opcache php7.1-pgsql php7.1-propro php7.1-raphf php7.1-readline php7.1-redis php7.1-soap php7.1-sqlite3 php7.1-ssh2 php7.1-xdebug php7.1-xml php7.1-xmlrpc php7.1-yaml php7.1-zip php7.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.3 b/Dockerfile.php7.3
index ee4a8e8..7c1ead3 100644
--- a/Dockerfile.php7.3
+++ b/Dockerfile.php7.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.3 php7.3-apcu php7.3-apcu-bc php7.3-bcmath php7.3-bz2 php7.3-cli php7.3-common php7.3-curl php7.3-fpm php7.3-gd php7.3-gmp php7.3-http php7.3-igbinary php7.3-imagick php7.3-imap php7.3-intl php7.3-json php7.3-mailparse php7.3-mbstring php7.3-memcached php7.3-mongodb php7.3-msgpack php7.3-mysql php7.3-opcache php7.3-pgsql php7.3-propro php7.3-raphf php7.3-readline php7.3-redis php7.3-soap php7.3-sqlite3 php7.3-ssh2 php7.3-xdebug php7.3-xml php7.3-xmlrpc php7.3-yaml php7.3-zip php7.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 15a7acd..8573bf2 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.4 php7.4-apcu php7.4-apcu-bc php7.4-bcmath php7.4-bz2 php7.4-cli php7.4-common php7.4-curl php7.4-fpm php7.4-gd php7.4-gmp php7.4-http php7.4-igbinary php7.4-imagick php7.4-imap php7.4-intl php7.4-json php7.4-mailparse php7.4-mbstring php7.4-memcached php7.4-mongodb php7.4-msgpack php7.4-mysql php7.4-opcache php7.4-pgsql php7.4-propro php7.4-raphf php7.4-readline php7.4-redis php7.4-soap php7.4-sqlite3 php7.4-ssh2 php7.4-xdebug php7.4-xml php7.4-xmlrpc php7.4-yaml php7.4-zip php7.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 7efa460..a0a9345 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.0-apcu php8.0-bcmath php8.0-bz2 php8.0-cli php8.0-common php8.0-curl php8.0-fpm php8.0-gd php8.0-gmp php8.0-igbinary php8.0-imagick php8.0-imap php8.0-intl php8.0-mailparse php8.0-mbstring php8.0-memcached php8.0-mongodb php8.0-msgpack php8.0-mysql php8.0-opcache php8.0-pgsql php8.0-raphf php8.0-readline php8.0-redis php8.0-soap php8.0-sqlite3 php8.0-tidy php8.0-uuid php8.0-xdebug php8.0-xml php8.0-xsl php8.0-yaml php8.0-zip php8.0-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 5da11e0..4e7b724 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.1-apcu php8.1-bcmath php8.1-bz2 php8.1-cli php8.1-common php8.1-curl php8.1-fpm php8.1-gd php8.1-gmp php8.1-igbinary php8.1-imagick php8.1-imap php8.1-intl php8.1-mailparse php8.1-mbstring php8.1-memcached php8.1-mongodb php8.1-msgpack php8.1-mysql php8.1-opcache php8.1-pgsql php8.1-raphf php8.1-readline php8.1-redis php8.1-soap php8.1-sqlite3 php8.1-tidy php8.1-uuid php8.1-xdebug php8.1-xml php8.1-xsl php8.1-yaml php8.1-zip php8.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 872bf49..6f8d393 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.2-apcu php8.2-bcmath php8.2-bz2 php8.2-cli php8.2-common php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-igbinary php8.2-imagick php8.2-imap php8.2-intl php8.2-mailparse php8.2-mbstring php8.2-memcached php8.2-mongodb php8.2-msgpack php8.2-mysql php8.2-opcache php8.2-pgsql php8.2-raphf php8.2-readline php8.2-redis php8.2-soap php8.2-sqlite3 php8.2-tidy php8.2-uuid php8.2-xdebug php8.2-xml php8.2-xsl php8.2-yaml php8.2-zip php8.2-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 5156fc4..19792b1 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.3-apcu php8.3-bcmath php8.3-bz2 php8.3-cli php8.3-common php8.3-curl php8.3-fpm php8.3-gd php8.3-gmp php8.3-igbinary php8.3-imagick php8.3-imap php8.3-intl php8.3-mailparse php8.3-mbstring php8.3-memcached php8.3-mongodb php8.3-msgpack php8.3-mysql php8.3-opcache php8.3-pgsql php8.3-raphf php8.3-readline php8.3-redis php8.3-soap php8.3-sqlite3 php8.3-tidy php8.3-uuid php8.3-xml php8.3-xsl php8.3-yaml php8.3-zip php8.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'e21205b207c3ff031906575712edab6f13eb0b361f2085f1f1237b7126d785e826a450292b6cfd1d64d92e6563bbde02') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \

From 362df44be05316e29669f54a4e533fe52b29b15b Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 1 Mar 2024 11:46:32 +0100
Subject: [PATCH 08/18] update ci

---
 .woodpecker/.build.yml | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 2ffa586..04cd898 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -9,23 +9,27 @@ matrix:
     - 7.1
 
 steps:
-  docker:
-    image: docker:dind
-    secrets: [registry_user, registry_password, registry_docker_password]
-    commands:
-      - echo "$REGISTRY_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin gitnet.fr
-      - echo "$REGISTRY_DOCKER_PASSWORD" | docker login -u "$REGISTRY_USER" --password-stdin
-      - docker build -t "deblan/php:$PHP_VERSION" -f "./Dockerfile.php$PHP_VERSION" .
-      - docker tag "deblan/php:$PHP_VERSION" "gitnet.fr/deblan/php:$PHP_VERSION"
-      - docker push "gitnet.fr/deblan/php:$PHP_VERSION"
-      - docker push "deblan/php:$PHP_VERSION"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+  "Docker build and push":
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      repo: gitnet.fr/deblan/php,deblan/php
+      tags: ${PHP_VERSION}
+      logins:
+        - registry: https://gitnet.fr
+          username:
+            from_secret: registry_user
+          password:
+            from_secret: registry_password
+        - registry: https://index.docker.io/v1/
+          username:
+            from_secret: registry_user
+          password:
+            from_secret: registry_docker_password
     when:
       - event: cron
       - branch: [master]
 
-  mail:
+  "Send notification":
     image: deblan/woodpecker-email
     settings:
       dsn:

From 8ae9d8ef9f854e175876759c85e9791988105835 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 1 Mar 2024 11:48:37 +0100
Subject: [PATCH 09/18] update ci

---
 .woodpecker/.build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index 04cd898..eb73fdf 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -14,6 +14,7 @@ steps:
     settings:
       repo: gitnet.fr/deblan/php,deblan/php
       tags: ${PHP_VERSION}
+      dockerfile: Dockerfile.php${PHP_VERSION}
       logins:
         - registry: https://gitnet.fr
           username:

From 339533f53244e63e2befb7e93b1f8d0eabc76ae7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Mar 2025 10:35:06 +0100
Subject: [PATCH 10/18] fix(ci): add woodpecker 3 syntax

---
 .woodpecker/.build.yml | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index eb73fdf..c68f09d 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -1,12 +1,13 @@
 matrix:
   PHP_VERSION:
+    - 8.4
     - 8.3
     - 8.2
     - 8.1
     - 8.0
-    - 7.4
-    - 7.3
-    - 7.1
+    # - 7.4
+    # - 7.3
+    # - 7.1
 
 steps:
   "Docker build and push":
@@ -30,7 +31,7 @@ steps:
       - event: cron
       - branch: [master]
 
-  "Send notification":
+  "Send notification (success)":
     image: deblan/woodpecker-email
     settings:
       dsn:
@@ -41,5 +42,21 @@ steps:
       recipients:
           from_secret: mail_to
       recipients_only: true
+      level: success
     when:
-      status: [success, failure]
+      status: success
+
+  "Send notification (failure)":
+    image: deblan/woodpecker-email
+    settings:
+      dsn:
+        from_secret: mail_dsn
+      from:
+        address:
+          from_secret: mail_from
+      recipients:
+          from_secret: mail_to
+      recipients_only: true
+      level: failure
+    when:
+      status: failure

From 232a9a37b1d8b6b047a1f400257750e00db3be88 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Mar 2025 10:35:11 +0100
Subject: [PATCH 11/18] add php8.4

---
 Dockerfile.php8.4 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Dockerfile.php8.4

diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
new file mode 100644
index 0000000..ab4fbb6
--- /dev/null
+++ b/Dockerfile.php8.4
@@ -0,0 +1,20 @@
+FROM debian:bullseye-slim
+
+RUN apt-get update \
+  && apt-get install -y apt-transport-https ca-certificates wget \
+  && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
+  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && apt-get update \
+  && apt-get install -y curl php8.4-apcu php8.4-bcmath php8.4-bz2 php8.4-cli php8.4-common php8.4-curl php8.4-fpm php8.4-gd php8.4-gmp php8.4-igbinary php8.4-imagick php8.4-imap php8.4-intl php8.4-mailparse php8.4-mbstring php8.4-memcached php8.4-mongodb php8.4-msgpack php8.4-mysql php8.4-opcache php8.4-pgsql php8.4-raphf php8.4-readline php8.4-redis php8.4-soap php8.4-sqlite3 php8.4-tidy php8.4-uuid php8.4-xml php8.4-xsl php8.4-yaml php8.4-zip php8.4-xmlrpc \
+  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php composer-setup.php \
+  && php -r "unlink('composer-setup.php');" \
+  && mv composer.phar /usr/local/bin/composer \
+  && chmod +x /usr/local/bin/composer \
+  && apt-get clean
+
+RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \
+  && apt-get update \
+  && apt-get install -y symfony-cli \
+  && apt-get clean

From b27680aba6b4f8fe03d9bbfdd448cb409dce647f Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 18 Jun 2025 16:57:23 +0200
Subject: [PATCH 12/18] feat: add unzip to avoid composer notice

---
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 Dockerfile.php8.4 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index a0a9345..541ea4d 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates wget \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
   && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 4e7b724..a37885a 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates wget \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
   && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 6f8d393..fa9d415 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates wget \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
   && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 19792b1..256d22e 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates wget \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
   && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index ab4fbb6..4e2453f 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -1,7 +1,7 @@
 FROM debian:bullseye-slim
 
 RUN apt-get update \
-  && apt-get install -y apt-transport-https ca-certificates wget \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
   && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \

From d015a5d6da3d8b644125f1c57851f53ed55e0728 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 1 Oct 2025 09:44:00 +0200
Subject: [PATCH 13/18] fix: update composer sha384

remove build of php8.0
---
 .woodpecker/.build.yml | 3 ++-
 Dockerfile.php7.1      | 2 +-
 Dockerfile.php7.3      | 2 +-
 Dockerfile.php7.4      | 2 +-
 Dockerfile.php8.0      | 2 +-
 Dockerfile.php8.1      | 2 +-
 Dockerfile.php8.2      | 2 +-
 Dockerfile.php8.3      | 2 +-
 Dockerfile.php8.4      | 2 +-
 9 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.woodpecker/.build.yml b/.woodpecker/.build.yml
index c68f09d..8851dfd 100644
--- a/.woodpecker/.build.yml
+++ b/.woodpecker/.build.yml
@@ -1,10 +1,11 @@
 matrix:
   PHP_VERSION:
+    - 8.5
     - 8.4
     - 8.3
     - 8.2
     - 8.1
-    - 8.0
+    # - 8.0
     # - 7.4
     # - 7.3
     # - 7.1
diff --git a/Dockerfile.php7.1 b/Dockerfile.php7.1
index 0c035e0..190577b 100644
--- a/Dockerfile.php7.1
+++ b/Dockerfile.php7.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.1 php7.1-apcu php7.1-apcu-bc php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-common php7.1-curl php7.1-fpm php7.1-gd php7.1-gmp php7.1-http php7.1-igbinary php7.1-imagick php7.1-imap php7.1-intl php7.1-json php7.1-mailparse php7.1-mbstring php7.1-memcached php7.1-mongodb php7.1-msgpack php7.1-mysql php7.1-opcache php7.1-pgsql php7.1-propro php7.1-raphf php7.1-readline php7.1-redis php7.1-soap php7.1-sqlite3 php7.1-ssh2 php7.1-xdebug php7.1-xml php7.1-xmlrpc php7.1-yaml php7.1-zip php7.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.3 b/Dockerfile.php7.3
index 7c1ead3..8556233 100644
--- a/Dockerfile.php7.3
+++ b/Dockerfile.php7.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.3 php7.3-apcu php7.3-apcu-bc php7.3-bcmath php7.3-bz2 php7.3-cli php7.3-common php7.3-curl php7.3-fpm php7.3-gd php7.3-gmp php7.3-http php7.3-igbinary php7.3-imagick php7.3-imap php7.3-intl php7.3-json php7.3-mailparse php7.3-mbstring php7.3-memcached php7.3-mongodb php7.3-msgpack php7.3-mysql php7.3-opcache php7.3-pgsql php7.3-propro php7.3-raphf php7.3-readline php7.3-redis php7.3-soap php7.3-sqlite3 php7.3-ssh2 php7.3-xdebug php7.3-xml php7.3-xmlrpc php7.3-yaml php7.3-zip php7.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 8573bf2..44340e7 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.4 php7.4-apcu php7.4-apcu-bc php7.4-bcmath php7.4-bz2 php7.4-cli php7.4-common php7.4-curl php7.4-fpm php7.4-gd php7.4-gmp php7.4-http php7.4-igbinary php7.4-imagick php7.4-imap php7.4-intl php7.4-json php7.4-mailparse php7.4-mbstring php7.4-memcached php7.4-mongodb php7.4-msgpack php7.4-mysql php7.4-opcache php7.4-pgsql php7.4-propro php7.4-raphf php7.4-readline php7.4-redis php7.4-soap php7.4-sqlite3 php7.4-ssh2 php7.4-xdebug php7.4-xml php7.4-xmlrpc php7.4-yaml php7.4-zip php7.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 541ea4d..02b2a14 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.0-apcu php8.0-bcmath php8.0-bz2 php8.0-cli php8.0-common php8.0-curl php8.0-fpm php8.0-gd php8.0-gmp php8.0-igbinary php8.0-imagick php8.0-imap php8.0-intl php8.0-mailparse php8.0-mbstring php8.0-memcached php8.0-mongodb php8.0-msgpack php8.0-mysql php8.0-opcache php8.0-pgsql php8.0-raphf php8.0-readline php8.0-redis php8.0-soap php8.0-sqlite3 php8.0-tidy php8.0-uuid php8.0-xdebug php8.0-xml php8.0-xsl php8.0-yaml php8.0-zip php8.0-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index a37885a..1e67e60 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.1-apcu php8.1-bcmath php8.1-bz2 php8.1-cli php8.1-common php8.1-curl php8.1-fpm php8.1-gd php8.1-gmp php8.1-igbinary php8.1-imagick php8.1-imap php8.1-intl php8.1-mailparse php8.1-mbstring php8.1-memcached php8.1-mongodb php8.1-msgpack php8.1-mysql php8.1-opcache php8.1-pgsql php8.1-raphf php8.1-readline php8.1-redis php8.1-soap php8.1-sqlite3 php8.1-tidy php8.1-uuid php8.1-xdebug php8.1-xml php8.1-xsl php8.1-yaml php8.1-zip php8.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index fa9d415..9e56e90 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.2-apcu php8.2-bcmath php8.2-bz2 php8.2-cli php8.2-common php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-igbinary php8.2-imagick php8.2-imap php8.2-intl php8.2-mailparse php8.2-mbstring php8.2-memcached php8.2-mongodb php8.2-msgpack php8.2-mysql php8.2-opcache php8.2-pgsql php8.2-raphf php8.2-readline php8.2-redis php8.2-soap php8.2-sqlite3 php8.2-tidy php8.2-uuid php8.2-xdebug php8.2-xml php8.2-xsl php8.2-yaml php8.2-zip php8.2-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 256d22e..012c322 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.3-apcu php8.3-bcmath php8.3-bz2 php8.3-cli php8.3-common php8.3-curl php8.3-fpm php8.3-gd php8.3-gmp php8.3-igbinary php8.3-imagick php8.3-imap php8.3-intl php8.3-mailparse php8.3-mbstring php8.3-memcached php8.3-mongodb php8.3-msgpack php8.3-mysql php8.3-opcache php8.3-pgsql php8.3-raphf php8.3-readline php8.3-redis php8.3-soap php8.3-sqlite3 php8.3-tidy php8.3-uuid php8.3-xml php8.3-xsl php8.3-yaml php8.3-zip php8.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index 4e2453f..2f309c5 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.4-apcu php8.4-bcmath php8.4-bz2 php8.4-cli php8.4-common php8.4-curl php8.4-fpm php8.4-gd php8.4-gmp php8.4-igbinary php8.4-imagick php8.4-imap php8.4-intl php8.4-mailparse php8.4-mbstring php8.4-memcached php8.4-mongodb php8.4-msgpack php8.4-mysql php8.4-opcache php8.4-pgsql php8.4-raphf php8.4-readline php8.4-redis php8.4-soap php8.4-sqlite3 php8.4-tidy php8.4-uuid php8.4-xml php8.4-xsl php8.4-yaml php8.4-zip php8.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'dac665fdc30fdd8ec78b38b9800061b4150413ff2e3b6f88543c636f7cd84f6db9189d43a81e5503cda447da73c7e5b6') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \

From df62a90a5882e668816e58cafe44c2cca72538d0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Wed, 1 Oct 2025 09:56:02 +0200
Subject: [PATCH 14/18] feat: add php8.5

---
 Dockerfile.php8.5 | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 Dockerfile.php8.5

diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
new file mode 100644
index 0000000..32575db
--- /dev/null
+++ b/Dockerfile.php8.5
@@ -0,0 +1,20 @@
+FROM debian:bullseye-slim
+
+RUN apt-get update \
+  && apt-get install -y apt-transport-https ca-certificates wget unzip \
+  && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
+  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && apt-get update \
+  && apt-get install -y curl php8.5-apcu php8.5-bcmath php8.5-bz2 php8.5-cli php8.5-common php8.5-curl php8.5-fpm php8.5-gd php8.5-gmp php8.5-igbinary php8.5-imagick php8.5-imap php8.5-intl php8.5-mailparse php8.5-mbstring php8.5-memcached php8.5-mongodb php8.5-msgpack php8.5-mysql php8.5-opcache php8.5-pgsql php8.5-raphf php8.5-readline php8.5-redis php8.5-soap php8.5-sqlite3 php8.5-tidy php8.5-uuid php8.5-xml php8.5-xsl php8.5-yaml php8.5-zip php8.5-xmlrpc \
+  && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php composer-setup.php \
+  && php -r "unlink('composer-setup.php');" \
+  && mv composer.phar /usr/local/bin/composer \
+  && chmod +x /usr/local/bin/composer \
+  && apt-get clean
+
+RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \
+  && apt-get update \
+  && apt-get install -y symfony-cli \
+  && apt-get clean

From b10e15cc6a27b59edb8d0673cdc1a1738378c6cd Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Nov 2025 15:58:23 +0100
Subject: [PATCH 15/18] fix composer hash

---
 Dockerfile.php7.1 | 2 +-
 Dockerfile.php7.3 | 2 +-
 Dockerfile.php7.4 | 2 +-
 Dockerfile.php8.0 | 2 +-
 Dockerfile.php8.1 | 2 +-
 Dockerfile.php8.2 | 2 +-
 Dockerfile.php8.3 | 2 +-
 Dockerfile.php8.4 | 2 +-
 Dockerfile.php8.5 | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Dockerfile.php7.1 b/Dockerfile.php7.1
index 190577b..3f38cec 100644
--- a/Dockerfile.php7.1
+++ b/Dockerfile.php7.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.1 php7.1-apcu php7.1-apcu-bc php7.1-bcmath php7.1-bz2 php7.1-cli php7.1-common php7.1-curl php7.1-fpm php7.1-gd php7.1-gmp php7.1-http php7.1-igbinary php7.1-imagick php7.1-imap php7.1-intl php7.1-json php7.1-mailparse php7.1-mbstring php7.1-memcached php7.1-mongodb php7.1-msgpack php7.1-mysql php7.1-opcache php7.1-pgsql php7.1-propro php7.1-raphf php7.1-readline php7.1-redis php7.1-soap php7.1-sqlite3 php7.1-ssh2 php7.1-xdebug php7.1-xml php7.1-xmlrpc php7.1-yaml php7.1-zip php7.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.3 b/Dockerfile.php7.3
index 8556233..b746542 100644
--- a/Dockerfile.php7.3
+++ b/Dockerfile.php7.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.3 php7.3-apcu php7.3-apcu-bc php7.3-bcmath php7.3-bz2 php7.3-cli php7.3-common php7.3-curl php7.3-fpm php7.3-gd php7.3-gmp php7.3-http php7.3-igbinary php7.3-imagick php7.3-imap php7.3-intl php7.3-json php7.3-mailparse php7.3-mbstring php7.3-memcached php7.3-mongodb php7.3-msgpack php7.3-mysql php7.3-opcache php7.3-pgsql php7.3-propro php7.3-raphf php7.3-readline php7.3-redis php7.3-soap php7.3-sqlite3 php7.3-ssh2 php7.3-xdebug php7.3-xml php7.3-xmlrpc php7.3-yaml php7.3-zip php7.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php7.4 b/Dockerfile.php7.4
index 44340e7..d6a5465 100644
--- a/Dockerfile.php7.4
+++ b/Dockerfile.php7.4
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y php7.4 php7.4-apcu php7.4-apcu-bc php7.4-bcmath php7.4-bz2 php7.4-cli php7.4-common php7.4-curl php7.4-fpm php7.4-gd php7.4-gmp php7.4-http php7.4-igbinary php7.4-imagick php7.4-imap php7.4-intl php7.4-json php7.4-mailparse php7.4-mbstring php7.4-memcached php7.4-mongodb php7.4-msgpack php7.4-mysql php7.4-opcache php7.4-pgsql php7.4-propro php7.4-raphf php7.4-readline php7.4-redis php7.4-soap php7.4-sqlite3 php7.4-ssh2 php7.4-xdebug php7.4-xml php7.4-xmlrpc php7.4-yaml php7.4-zip php7.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 02b2a14..1439aee 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.0-apcu php8.0-bcmath php8.0-bz2 php8.0-cli php8.0-common php8.0-curl php8.0-fpm php8.0-gd php8.0-gmp php8.0-igbinary php8.0-imagick php8.0-imap php8.0-intl php8.0-mailparse php8.0-mbstring php8.0-memcached php8.0-mongodb php8.0-msgpack php8.0-mysql php8.0-opcache php8.0-pgsql php8.0-raphf php8.0-readline php8.0-redis php8.0-soap php8.0-sqlite3 php8.0-tidy php8.0-uuid php8.0-xdebug php8.0-xml php8.0-xsl php8.0-yaml php8.0-zip php8.0-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index 1e67e60..fb131d3 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.1-apcu php8.1-bcmath php8.1-bz2 php8.1-cli php8.1-common php8.1-curl php8.1-fpm php8.1-gd php8.1-gmp php8.1-igbinary php8.1-imagick php8.1-imap php8.1-intl php8.1-mailparse php8.1-mbstring php8.1-memcached php8.1-mongodb php8.1-msgpack php8.1-mysql php8.1-opcache php8.1-pgsql php8.1-raphf php8.1-readline php8.1-redis php8.1-soap php8.1-sqlite3 php8.1-tidy php8.1-uuid php8.1-xdebug php8.1-xml php8.1-xsl php8.1-yaml php8.1-zip php8.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index 9e56e90..d3cccea 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.2-apcu php8.2-bcmath php8.2-bz2 php8.2-cli php8.2-common php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-igbinary php8.2-imagick php8.2-imap php8.2-intl php8.2-mailparse php8.2-mbstring php8.2-memcached php8.2-mongodb php8.2-msgpack php8.2-mysql php8.2-opcache php8.2-pgsql php8.2-raphf php8.2-readline php8.2-redis php8.2-soap php8.2-sqlite3 php8.2-tidy php8.2-uuid php8.2-xdebug php8.2-xml php8.2-xsl php8.2-yaml php8.2-zip php8.2-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index 012c322..a8a159b 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.3-apcu php8.3-bcmath php8.3-bz2 php8.3-cli php8.3-common php8.3-curl php8.3-fpm php8.3-gd php8.3-gmp php8.3-igbinary php8.3-imagick php8.3-imap php8.3-intl php8.3-mailparse php8.3-mbstring php8.3-memcached php8.3-mongodb php8.3-msgpack php8.3-mysql php8.3-opcache php8.3-pgsql php8.3-raphf php8.3-readline php8.3-redis php8.3-soap php8.3-sqlite3 php8.3-tidy php8.3-uuid php8.3-xml php8.3-xsl php8.3-yaml php8.3-zip php8.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index 2f309c5..3382187 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.4-apcu php8.4-bcmath php8.4-bz2 php8.4-cli php8.4-common php8.4-curl php8.4-fpm php8.4-gd php8.4-gmp php8.4-igbinary php8.4-imagick php8.4-imap php8.4-intl php8.4-mailparse php8.4-mbstring php8.4-memcached php8.4-mongodb php8.4-msgpack php8.4-mysql php8.4-opcache php8.4-pgsql php8.4-raphf php8.4-readline php8.4-redis php8.4-soap php8.4-sqlite3 php8.4-tidy php8.4-uuid php8.4-xml php8.4-xsl php8.4-yaml php8.4-zip php8.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \
diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index 32575db..62346e7 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -7,7 +7,7 @@ RUN apt-get update \
   && apt-get update \
   && apt-get install -y curl php8.5-apcu php8.5-bcmath php8.5-bz2 php8.5-cli php8.5-common php8.5-curl php8.5-fpm php8.5-gd php8.5-gmp php8.5-igbinary php8.5-imagick php8.5-imap php8.5-intl php8.5-mailparse php8.5-mbstring php8.5-memcached php8.5-mongodb php8.5-msgpack php8.5-mysql php8.5-opcache php8.5-pgsql php8.5-raphf php8.5-readline php8.5-redis php8.5-soap php8.5-sqlite3 php8.5-tidy php8.5-uuid php8.5-xml php8.5-xsl php8.5-yaml php8.5-zip php8.5-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
-  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'ed0feb545ba87161262f2d45a633e34f591ebb3381f2e0063c345ebea4d228dd0043083717770234ec00c5a9f9593792') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
+  && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \
   && php -r "unlink('composer-setup.php');" \
   && mv composer.phar /usr/local/bin/composer \

From 1ef567079b9c1b66213a9be7323fd6bd07a192a0 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Nov 2025 16:16:44 +0100
Subject: [PATCH 16/18] upgrade to debian trixie

---
 Dockerfile.php8.0 | 4 ++--
 Dockerfile.php8.1 | 4 ++--
 Dockerfile.php8.2 | 4 ++--
 Dockerfile.php8.3 | 4 ++--
 Dockerfile.php8.4 | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile.php8.0 b/Dockerfile.php8.0
index 1439aee..ce976ee 100644
--- a/Dockerfile.php8.0
+++ b/Dockerfile.php8.0
@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
   && apt-get install -y curl php8.0-apcu php8.0-bcmath php8.0-bz2 php8.0-cli php8.0-common php8.0-curl php8.0-fpm php8.0-gd php8.0-gmp php8.0-igbinary php8.0-imagick php8.0-imap php8.0-intl php8.0-mailparse php8.0-mbstring php8.0-memcached php8.0-mongodb php8.0-msgpack php8.0-mysql php8.0-opcache php8.0-pgsql php8.0-raphf php8.0-readline php8.0-redis php8.0-soap php8.0-sqlite3 php8.0-tidy php8.0-uuid php8.0-xdebug php8.0-xml php8.0-xsl php8.0-yaml php8.0-zip php8.0-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
diff --git a/Dockerfile.php8.1 b/Dockerfile.php8.1
index fb131d3..c0fe777 100644
--- a/Dockerfile.php8.1
+++ b/Dockerfile.php8.1
@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
   && apt-get install -y curl php8.1-apcu php8.1-bcmath php8.1-bz2 php8.1-cli php8.1-common php8.1-curl php8.1-fpm php8.1-gd php8.1-gmp php8.1-igbinary php8.1-imagick php8.1-imap php8.1-intl php8.1-mailparse php8.1-mbstring php8.1-memcached php8.1-mongodb php8.1-msgpack php8.1-mysql php8.1-opcache php8.1-pgsql php8.1-raphf php8.1-readline php8.1-redis php8.1-soap php8.1-sqlite3 php8.1-tidy php8.1-uuid php8.1-xdebug php8.1-xml php8.1-xsl php8.1-yaml php8.1-zip php8.1-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
diff --git a/Dockerfile.php8.2 b/Dockerfile.php8.2
index d3cccea..4639bde 100644
--- a/Dockerfile.php8.2
+++ b/Dockerfile.php8.2
@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
   && apt-get install -y curl php8.2-apcu php8.2-bcmath php8.2-bz2 php8.2-cli php8.2-common php8.2-curl php8.2-fpm php8.2-gd php8.2-gmp php8.2-igbinary php8.2-imagick php8.2-imap php8.2-intl php8.2-mailparse php8.2-mbstring php8.2-memcached php8.2-mongodb php8.2-msgpack php8.2-mysql php8.2-opcache php8.2-pgsql php8.2-raphf php8.2-readline php8.2-redis php8.2-soap php8.2-sqlite3 php8.2-tidy php8.2-uuid php8.2-xdebug php8.2-xml php8.2-xsl php8.2-yaml php8.2-zip php8.2-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
diff --git a/Dockerfile.php8.3 b/Dockerfile.php8.3
index a8a159b..61a5865 100644
--- a/Dockerfile.php8.3
+++ b/Dockerfile.php8.3
@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
   && apt-get install -y curl php8.3-apcu php8.3-bcmath php8.3-bz2 php8.3-cli php8.3-common php8.3-curl php8.3-fpm php8.3-gd php8.3-gmp php8.3-igbinary php8.3-imagick php8.3-imap php8.3-intl php8.3-mailparse php8.3-mbstring php8.3-memcached php8.3-mongodb php8.3-msgpack php8.3-mysql php8.3-opcache php8.3-pgsql php8.3-raphf php8.3-readline php8.3-redis php8.3-soap php8.3-sqlite3 php8.3-tidy php8.3-uuid php8.3-xml php8.3-xsl php8.3-yaml php8.3-zip php8.3-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
diff --git a/Dockerfile.php8.4 b/Dockerfile.php8.4
index 3382187..640dd10 100644
--- a/Dockerfile.php8.4
+++ b/Dockerfile.php8.4
@@ -1,9 +1,9 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
   && apt-get install -y curl php8.4-apcu php8.4-bcmath php8.4-bz2 php8.4-cli php8.4-common php8.4-curl php8.4-fpm php8.4-gd php8.4-gmp php8.4-igbinary php8.4-imagick php8.4-imap php8.4-intl php8.4-mailparse php8.4-mbstring php8.4-memcached php8.4-mongodb php8.4-msgpack php8.4-mysql php8.4-opcache php8.4-pgsql php8.4-raphf php8.4-readline php8.4-redis php8.4-soap php8.4-sqlite3 php8.4-tidy php8.4-uuid php8.4-xml php8.4-xsl php8.4-yaml php8.4-zip php8.4-xmlrpc \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \

From c2ce70cf4a104566264ece2ced3d5988596c88c7 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Nov 2025 16:17:01 +0100
Subject: [PATCH 17/18] fix php8.5 packages

---
 Dockerfile.php8.5 | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index 62346e7..7abad52 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -1,11 +1,12 @@
-FROM debian:bullseye-slim
+FROM debian:trixie-slim
 
 RUN apt-get update \
   && apt-get install -y apt-transport-https ca-certificates wget unzip \
   && wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg \
-  && sh -c 'echo "deb https://packages.sury.org/php/ bullseye main" > /etc/apt/sources.list.d/php.list' \
+  && sh -c 'echo "deb https://packages.sury.org/php/ trixie main" > /etc/apt/sources.list.d/php.list' \
   && apt-get update \
-  && apt-get install -y curl php8.5-apcu php8.5-bcmath php8.5-bz2 php8.5-cli php8.5-common php8.5-curl php8.5-fpm php8.5-gd php8.5-gmp php8.5-igbinary php8.5-imagick php8.5-imap php8.5-intl php8.5-mailparse php8.5-mbstring php8.5-memcached php8.5-mongodb php8.5-msgpack php8.5-mysql php8.5-opcache php8.5-pgsql php8.5-raphf php8.5-readline php8.5-redis php8.5-soap php8.5-sqlite3 php8.5-tidy php8.5-uuid php8.5-xml php8.5-xsl php8.5-yaml php8.5-zip php8.5-xmlrpc \
+  # && apt-get install -y curl php8.5-apcu php8.5-bcmath php8.5-bz2 php8.5-cli php8.5-common php8.5-curl php8.5-fpm php8.5-gd php8.5-gmp php8.5-igbinary php8.5-imagick php8.5-imap php8.5-intl php8.5-mailparse php8.5-mbstring php8.5-memcached php8.5-mongodb php8.5-msgpack php8.5-mysql php8.5-opcache php8.5-pgsql php8.5-raphf php8.5-readline php8.5-redis php8.5-soap php8.5-sqlite3 php8.5-tidy php8.5-uuid php8.5-xml php8.5-xsl php8.5-yaml php8.5-zip php8.5-xmlrpc \
+  && apt-get install -y php8.5 php8.5-bcmath php8.5-bz2 php8.5-cgi php8.5-cli php8.5-common php8.5-curl php8.5-dba php8.5-dev php8.5-enchant php8.5-fpm php8.5-gd php8.5-gmp php8.5-interbase php8.5-intl php8.5-ldap php8.5-mbstring php8.5-mysql php8.5-odbc php8.5-pgsql php8.5-readline php8.5-snmp php8.5-soap php8.5-sqlite3 php8.5-sybase php8.5-tidy php8.5-xml php8.5-xsl php8.5-zip \
   && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \
   && php -r "if (hash_file('sha384', 'composer-setup.php') === 'c8b085408188070d5f52bcfe4ecfbee5f727afa458b2573b8eaaf77b3419b0bf2768dc67c86944da1544f06fa544fd47') { echo 'Installer verified'; } else { echo 'Installer corrupt'; unlink('composer-setup.php'); } echo PHP_EOL;" \
   && php composer-setup.php \

From 0f2eb24a7d484180d5b4f220c70c3adf6e7b9046 Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Sat, 1 Nov 2025 16:36:45 +0100
Subject: [PATCH 18/18] php8.5: remove symfony-cli

---
 Dockerfile.php8.5 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.php8.5 b/Dockerfile.php8.5
index 7abad52..1d1d969 100644
--- a/Dockerfile.php8.5
+++ b/Dockerfile.php8.5
@@ -15,7 +15,7 @@ RUN apt-get update \
   && chmod +x /usr/local/bin/composer \
   && apt-get clean
 
-RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \
-  && apt-get update \
-  && apt-get install -y symfony-cli \
-  && apt-get clean
+# RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | bash \
+#   && apt-get update \
+#   && apt-get install -y symfony-cli \
+#   && apt-get clean