From 30a8d44d6d35c61b3240506338a7a38262a89e5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alo=C3=AFs=20Micard?= Date: Tue, 16 Sep 2025 21:24:40 +0200 Subject: [PATCH] Upgrade base image to Debian "bookworm" Closes: #82 --- images/16.0.5-php8.1/Dockerfile | 2 +- images/17.0.4-php8.1/Dockerfile | 2 +- images/18.0.6-php8.1/Dockerfile | 2 +- images/19.0.4-php8.2/Dockerfile | 2 +- images/20.0.4-php8.2/Dockerfile | 2 +- images/21.0.2-php8.2/Dockerfile | 2 +- images/22.0.0-php8.2/Dockerfile | 2 +- images/develop/Dockerfile | 2 +- update.sh | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/images/16.0.5-php8.1/Dockerfile b/images/16.0.5-php8.1/Dockerfile index ff0da50..6cea032 100644 --- a/images/16.0.5-php8.1/Dockerfile +++ b/images/16.0.5-php8.1/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.1-apache-bullseye +FROM ${ARCH}php:8.1-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/17.0.4-php8.1/Dockerfile b/images/17.0.4-php8.1/Dockerfile index f6d0d47..2b3e566 100644 --- a/images/17.0.4-php8.1/Dockerfile +++ b/images/17.0.4-php8.1/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.1-apache-bullseye +FROM ${ARCH}php:8.1-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/18.0.6-php8.1/Dockerfile b/images/18.0.6-php8.1/Dockerfile index 412f216..e97da69 100644 --- a/images/18.0.6-php8.1/Dockerfile +++ b/images/18.0.6-php8.1/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.1-apache-bullseye +FROM ${ARCH}php:8.1-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/19.0.4-php8.2/Dockerfile b/images/19.0.4-php8.2/Dockerfile index 84b3f56..f1da402 100644 --- a/images/19.0.4-php8.2/Dockerfile +++ b/images/19.0.4-php8.2/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.2-apache-bullseye +FROM ${ARCH}php:8.2-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/20.0.4-php8.2/Dockerfile b/images/20.0.4-php8.2/Dockerfile index 8106a45..a848a90 100644 --- a/images/20.0.4-php8.2/Dockerfile +++ b/images/20.0.4-php8.2/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.2-apache-bullseye +FROM ${ARCH}php:8.2-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/21.0.2-php8.2/Dockerfile b/images/21.0.2-php8.2/Dockerfile index 9da40c5..53b1ceb 100644 --- a/images/21.0.2-php8.2/Dockerfile +++ b/images/21.0.2-php8.2/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.2-apache-bullseye +FROM ${ARCH}php:8.2-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/22.0.0-php8.2/Dockerfile b/images/22.0.0-php8.2/Dockerfile index 2982a82..93ee944 100644 --- a/images/22.0.0-php8.2/Dockerfile +++ b/images/22.0.0-php8.2/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.2-apache-bullseye +FROM ${ARCH}php:8.2-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/images/develop/Dockerfile b/images/develop/Dockerfile index 49a195c..78fe8ac 100644 --- a/images/develop/Dockerfile +++ b/images/develop/Dockerfile @@ -4,7 +4,7 @@ ARG ARCH= # Example: PHP_BASE_IMAGE=x.y-apache-buster # Example: PHP_BASE_IMAGE=x.y-apache-bullseye # Note: Version of the PHP image must be a compatible version according to https://wiki.dolibarr.org/index.php?title=Versions -FROM ${ARCH}php:8.2-apache-bullseye +FROM ${ARCH}php:8.2-apache-bookworm # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: diff --git a/update.sh b/update.sh index 4c7da6b..792124a 100755 --- a/update.sh +++ b/update.sh @@ -40,9 +40,9 @@ for dolibarrVersion in "${DOLIBARR_VERSIONS[@]}"; do # Mapping PHP version according to Dolibarr version (See https://wiki.dolibarr.org/index.php/Versions) # Regarding PHP Supported version : https://www.php.net/supported-versions.php if [ "${dolibarrVersion}" = "develop" ] || [ "${dolibarrMajor}" -ge "19" ] || [ "${dolibarrMajor}" -ge "20" ] || [ "${dolibarrMajor}" -ge "21" ]; then - php_base_images=( "8.2-apache-bullseye" ) + php_base_images=( "8.2-apache-bookworm" ) elif [ "${dolibarrMajor}" -ge "16" ]; then - php_base_images=( "8.1-apache-bullseye" ) + php_base_images=( "8.1-apache-bookworm" ) else php_base_images=( "7.4-apache-bullseye" ) fi