From 441d19e30143f6fc1fcdfc6048d68d0283c34e2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9s=20Maldonado?= Date: Wed, 30 Oct 2024 15:06:28 +0100 Subject: [PATCH] Update base images to Bullseye In Bullseye, libldap-common is no longer a dependency of libldap2-dev, but it's still required for LDAPS connections --- Dockerfile.template | 5 +++-- images/15.0.3-php7.4/Dockerfile | 7 ++++--- images/16.0.5-php8.1/Dockerfile | 7 ++++--- images/17.0.4-php8.1/Dockerfile | 7 ++++--- images/18.0.6-php8.1/Dockerfile | 7 ++++--- images/19.0.4-php8.2/Dockerfile | 7 ++++--- images/20.0.2-php8.2/Dockerfile | 7 ++++--- images/develop/Dockerfile | 7 ++++--- update.sh | 8 ++++---- 9 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Dockerfile.template b/Dockerfile.template index 1ce0b14..61b6104 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -5,8 +5,8 @@ FROM ${ARCH}php:%PHP_BASE_IMAGE% # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION %DOLI_VERSION% @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/15.0.3-php7.4/Dockerfile b/images/15.0.3-php7.4/Dockerfile index 42f9335..12cab77 100644 --- a/images/15.0.3-php7.4/Dockerfile +++ b/images/15.0.3-php7.4/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:7.4-apache-buster +FROM ${ARCH}php:7.4-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 15.0.3 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/16.0.5-php8.1/Dockerfile b/images/16.0.5-php8.1/Dockerfile index ded9990..54066ac 100644 --- a/images/16.0.5-php8.1/Dockerfile +++ b/images/16.0.5-php8.1/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.1-apache-buster +FROM ${ARCH}php:8.1-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 16.0.5 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/17.0.4-php8.1/Dockerfile b/images/17.0.4-php8.1/Dockerfile index bacdd67..6a2e5a4 100644 --- a/images/17.0.4-php8.1/Dockerfile +++ b/images/17.0.4-php8.1/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.1-apache-buster +FROM ${ARCH}php:8.1-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 17.0.4 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/18.0.6-php8.1/Dockerfile b/images/18.0.6-php8.1/Dockerfile index 735a5c3..7d07337 100644 --- a/images/18.0.6-php8.1/Dockerfile +++ b/images/18.0.6-php8.1/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.1-apache-buster +FROM ${ARCH}php:8.1-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 18.0.6 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/19.0.4-php8.2/Dockerfile b/images/19.0.4-php8.2/Dockerfile index fcd64a8..5d60155 100644 --- a/images/19.0.4-php8.2/Dockerfile +++ b/images/19.0.4-php8.2/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.2-apache-buster +FROM ${ARCH}php:8.2-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 19.0.4 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/20.0.2-php8.2/Dockerfile b/images/20.0.2-php8.2/Dockerfile index b2a2375..f1fe621 100644 --- a/images/20.0.2-php8.2/Dockerfile +++ b/images/20.0.2-php8.2/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.2-apache-buster +FROM ${ARCH}php:8.2-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION 20.0.2 @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/images/develop/Dockerfile b/images/develop/Dockerfile index e191b2d..6bf5a5b 100644 --- a/images/develop/Dockerfile +++ b/images/develop/Dockerfile @@ -1,12 +1,12 @@ ARG ARCH= # Use an image like PHP_BASE_IMAGE=x.y-apache-buster -FROM ${ARCH}php:8.2-apache-buster +FROM ${ARCH}php:8.2-apache-bullseye # Credit/Initial maintainer: Garcia MICHEL # Modified according to the GPL license by developers of the Dolibarr community: -# 2024 Alois Micard -# 2024 Laurent Destailleur +# 2024 Alois Micard +# 2024 Laurent Destailleur LABEL maintainer="The Dolibarr foundation " ENV DOLI_VERSION develop @@ -59,6 +59,7 @@ RUN apt-get update -y \ libjpeg62-turbo-dev \ libkrb5-dev \ libldap2-dev \ + libldap-common \ libpng-dev \ libpq-dev \ libxml2-dev \ diff --git a/update.sh b/update.sh index 36c4bde..0f5b701 100755 --- a/update.sh +++ b/update.sh @@ -2,7 +2,7 @@ # # Run this script to generate all files found into images directory, used for each image. # The source files are the files into the root. -# +# set -e @@ -36,11 +36,11 @@ 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-buster" ) + php_base_images=( "8.2-apache-bullseye" ) elif [ "${dolibarrMajor}" -ge "16" ]; then - php_base_images=( "8.1-apache-buster" ) + php_base_images=( "8.1-apache-bullseye" ) else - php_base_images=( "7.4-apache-buster" ) + php_base_images=( "7.4-apache-bullseye" ) fi for php_base_image in "${php_base_images[@]}"; do