Merge pull request #441 from Quetzacoalt91/handle-debian-trixie

Stop installing a lib deleted on Debian Trixie

Author: Quetzacoalt91

base/Dockerfile.model

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/7.3-apache/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 # PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath

base/images/7.3-fpm/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 # PHP < 7.4 have an old syntax to install GD. See https://github.com/docker-library/php/issues/912
 RUN docker-php-ext-configure gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/ --with-webp-dir=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath

base/images/7.4-apache/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/7.4-fpm/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/8.0-apache/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/8.0-fpm/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/8.1-apache/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/8.1-fpm/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath
 

base/images/8.2-apache/Dockerfile

@@ -27,7 +27,6 @@ PS_FOLDER_INSTALL=install
 RUN apt-get update \
     && apt-get install -y libmcrypt-dev \
         libjpeg62-turbo-dev \
-        libpcre3-dev \
         libpng-dev \
         libwebp-dev \
         libfreetype6-dev \
@@ -37,9 +36,13 @@ RUN apt-get update \
         default-mysql-client \
         wget \
         unzip \
-        libonig-dev
+        libonig-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN if [[ "$(cat /etc/os-release)" == *"bookworm"* ]]; then apt-get update \
+    && apt-get install -y libpcre3-dev \
+    && rm -rf /var/lib/apt/lists/*; fi
 
-RUN rm -rf /var/lib/apt/lists/*
 RUN docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ --with-webp=/usr/include
 RUN docker-php-ext-install iconv intl pdo_mysql mbstring soap gd zip bcmath