Wavyzz/dolibarr-docker-fork
2
0
Fork 0
forked from Wavyzz/dolibarr-docker
Code Pull Requests Actions Activity

Update base images to Bullseye

Browse Source 
In Bullseye, libldap-common is no longer a dependency of libldap2-dev,
but it's still required for LDAPS connections
This commit is contained in:
Andrés Maldonado
2024-10-30 15:06:28 +01:00
parent 1bb488f54c
commit 441d19e301
9 changed files with 35 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.template
View File

@@ -5,8 +5,8 @@ FROM ${ARCH}php:%PHP_BASE_IMAGE%
# Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION %DOLI_VERSION% ENV DOLI_VERSION %DOLI_VERSION%
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/15.0.3-php7.4/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 15.0.3 ENV DOLI_VERSION 15.0.3
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/16.0.5-php8.1/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 16.0.5 ENV DOLI_VERSION 16.0.5
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/17.0.4-php8.1/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 17.0.4 ENV DOLI_VERSION 17.0.4
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/18.0.6-php8.1/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 18.0.6 ENV DOLI_VERSION 18.0.6
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/19.0.4-php8.2/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 19.0.4 ENV DOLI_VERSION 19.0.4
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/20.0.2-php8.2/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION 20.0.2 ENV DOLI_VERSION 20.0.2
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

7
images/develop/Dockerfile
View File

@@ -1,12 +1,12 @@
ARG ARCH= ARG ARCH=
# Use an image like PHP_BASE_IMAGE=x.y-apache-buster # 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 <garcia@soamichel.fr> # Credit/Initial maintainer: Garcia MICHEL <garcia@soamichel.fr>
# Modified according to the GPL license by developers of the Dolibarr community: # Modified according to the GPL license by developers of the Dolibarr community:
# 2024 Alois Micard # 2024 Alois Micard
# 2024 Laurent Destailleur # 2024 Laurent Destailleur
LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>" LABEL maintainer="The Dolibarr foundation <contact@dolibarr.org>"
ENV DOLI_VERSION develop ENV DOLI_VERSION develop
@@ -59,6 +59,7 @@ RUN apt-get update -y \
libjpeg62-turbo-dev \ libjpeg62-turbo-dev \
libkrb5-dev \ libkrb5-dev \
libldap2-dev \ libldap2-dev \
libldap-common \
libpng-dev \ libpng-dev \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \

8
update.sh
View File

@@ -2,7 +2,7 @@
# #
# Run this script to generate all files found into images directory, used for each image. # Run this script to generate all files found into images directory, used for each image.
# The source files are the files into the root. # The source files are the files into the root.
# #
set -e 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) # 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 # Regarding PHP Supported version : https://www.php.net/supported-versions.php
if [ "${dolibarrVersion}" = "develop" ] || [ "${dolibarrMajor}" -ge "19" ] || [ "${dolibarrMajor}" -ge "20" ] || [ "${dolibarrMajor}" -ge "21" ]; then 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 elif [ "${dolibarrMajor}" -ge "16" ]; then
php_base_images=( "8.1-apache-buster" ) php_base_images=( "8.1-apache-bullseye" )
else else
php_base_images=( "7.4-apache-buster" ) php_base_images=( "7.4-apache-bullseye" )
fi fi
for php_base_image in "${php_base_images[@]}"; do for php_base_image in "${php_base_images[@]}"; do