From ffc2bc07f2f26640e89eed41548148abed262084 Mon Sep 17 00:00:00 2001 From: STAM Date: Mon, 24 Jul 2023 22:46:12 +0300 Subject: [PATCH] php fixes --- linux/ecosystem/apache2/php8.2/Dockerfile | 4 ++-- linux/ecosystem/php/php7.0/Dockerfile | 6 ++++++ linux/ecosystem/php/php7.1/Dockerfile | 6 ++++++ linux/ecosystem/php/php7.2/Dockerfile | 6 ++++++ linux/ecosystem/php/php7.3/Dockerfile | 10 ++++++++-- linux/ecosystem/php/php7.4/Dockerfile | 8 +++++++- linux/ecosystem/php/php8.0/Dockerfile | 4 +--- linux/ecosystem/php/php8.1/Dockerfile | 4 +--- linux/ecosystem/php/php8.2/Dockerfile | 1 + linux/ecosystem/php/php8.3/Dockerfile | 1 + 10 files changed, 39 insertions(+), 11 deletions(-) diff --git a/linux/ecosystem/apache2/php8.2/Dockerfile b/linux/ecosystem/apache2/php8.2/Dockerfile index 35ebaaa1e..86459bda2 100644 --- a/linux/ecosystem/apache2/php8.2/Dockerfile +++ b/linux/ecosystem/apache2/php8.2/Dockerfile @@ -22,12 +22,12 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ apache2 \ apache2-utils \ - libapache2-mod-php8.1 \ + libapache2-mod-php8.2 \ libapache2-mod-webauth \ libapache2-mod-xforward \ libapache2-mod-security2 && \ a2enmod \ - php8.1 \ + php8.2 \ rewrite \ ldap \ heartmonitor \ diff --git a/linux/ecosystem/php/php7.0/Dockerfile b/linux/ecosystem/php/php7.0/Dockerfile index 39611a678..618c92bbc 100644 --- a/linux/ecosystem/php/php7.0/Dockerfile +++ b/linux/ecosystem/php/php7.0/Dockerfile @@ -38,13 +38,18 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + php-pear \ php7.0 \ php7.0-common \ php7.0-dev \ php7.0-fpm \ php7.0-cli \ + php7.0-xml \ php7.0-cgi && \ update-alternatives --set php /usr/bin/php7.0 && \ + pear upgrade && \ + pear update-channels && \ + pecl channel-update pecl.php.net && \ php -m && \ php -v @@ -99,6 +104,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php7.0 \ php7.0-common \ php7.0-dev \ diff --git a/linux/ecosystem/php/php7.1/Dockerfile b/linux/ecosystem/php/php7.1/Dockerfile index cce88197a..cc6839247 100644 --- a/linux/ecosystem/php/php7.1/Dockerfile +++ b/linux/ecosystem/php/php7.1/Dockerfile @@ -38,13 +38,18 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + php-pear \ php7.1 \ php7.1-common \ php7.1-dev \ php7.1-fpm \ php7.1-cli \ + php7.1-xml \ php7.1-cgi && \ update-alternatives --set php /usr/bin/php7.1 && \ + pear upgrade && \ + pear update-channels && \ + pecl channel-update pecl.php.net && \ php -m && \ php -v @@ -99,6 +104,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php7.1 \ php7.1-common \ php7.1-dev \ diff --git a/linux/ecosystem/php/php7.2/Dockerfile b/linux/ecosystem/php/php7.2/Dockerfile index eaf75711f..457039fcd 100644 --- a/linux/ecosystem/php/php7.2/Dockerfile +++ b/linux/ecosystem/php/php7.2/Dockerfile @@ -38,13 +38,18 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + php-pear \ php7.2 \ php7.2-common \ php7.2-dev \ php7.2-fpm \ php7.2-cli \ + php7.2-xml \ php7.2-cgi && \ update-alternatives --set php /usr/bin/php7.2 && \ + pear upgrade && \ + pear update-channels && \ + pecl channel-update pecl.php.net && \ php -m && \ php -v @@ -99,6 +104,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php7.2 \ php7.2-common \ php7.2-dev \ diff --git a/linux/ecosystem/php/php7.3/Dockerfile b/linux/ecosystem/php/php7.3/Dockerfile index 3a2f65392..ba0deb992 100644 --- a/linux/ecosystem/php/php7.3/Dockerfile +++ b/linux/ecosystem/php/php7.3/Dockerfile @@ -1,4 +1,4 @@ -FROM epicmorg/debian:buster-develop AS builder +FROM epicmorg/debian:bullseye-develop AS builder LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -38,13 +38,18 @@ RUN sh -c 'echo "deb https://packages.sury.org/php/ $(lsb_release -sc) main" > / RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ + php-pear \ php7.3 \ php7.3-common \ php7.3-dev \ php7.3-fpm \ php7.3-cli \ + php7.3-xml \ php7.3-cgi && \ update-alternatives --set php /usr/bin/php7.3 && \ + pear upgrade && \ + pear update-channels && \ + pecl channel-update pecl.php.net && \ php -m && \ php -v @@ -80,7 +85,7 @@ RUN cd ${MAKE_DIR} && \ ################################################################## ################################################################## -FROM epicmorg/debian:buster +FROM epicmorg/debian:bullseye LABEL maintainer="EpicMorg DevTeam, developer@epicm.org" ARG DEBIAN_FRONTEND=noninteractive @@ -99,6 +104,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php7.3 \ php7.3-common \ php7.3-dev \ diff --git a/linux/ecosystem/php/php7.4/Dockerfile b/linux/ecosystem/php/php7.4/Dockerfile index dfc9c7ad9..3de41686a 100644 --- a/linux/ecosystem/php/php7.4/Dockerfile +++ b/linux/ecosystem/php/php7.4/Dockerfile @@ -37,13 +37,18 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ smbclient libsmbclient libsmbclient-dev \ + php-pear \ php7.4 \ php7.4-common \ php7.4-dev \ php7.4-fpm \ php7.4-cli \ + php7.4-xml \ php7.4-cgi && \ update-alternatives --set php /usr/bin/php7.4 && \ + pear upgrade && \ + pear update-channels && \ + pecl channel-update pecl.php.net && \ php -m && \ php -v @@ -105,6 +110,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php7.4 \ php7.4-common \ php7.4-dev \ @@ -146,8 +152,8 @@ RUN apt-get update && \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ update-alternatives --set php /usr/bin/php7.4 && \ - pear update-channels && \ pear upgrade && \ + pear update-channels && \ pecl channel-update pecl.php.net && \ php -m && \ php -v diff --git a/linux/ecosystem/php/php8.0/Dockerfile b/linux/ecosystem/php/php8.0/Dockerfile index 24b245cbc..e83a9d300 100644 --- a/linux/ecosystem/php/php8.0/Dockerfile +++ b/linux/ecosystem/php/php8.0/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php8.0 \ php8.0-common \ php8.0-dev \ @@ -36,7 +37,6 @@ RUN apt-get update && \ php8.0-fpm \ php8.0-imap \ php8.0-pspell \ - php8.0-recode \ php8.0-sqlite3 \ php8.0-pgsql \ php8.0-tidy \ @@ -48,7 +48,6 @@ RUN apt-get update && \ php8.0-cli \ php8.0-common \ php8.0-cgi \ - php8.0-json \ php8.0-readline \ php8.0-enchant \ php8.0-ssh2 \ @@ -57,7 +56,6 @@ RUN apt-get update && \ php8.0-redis \ php8.0-smbclient \ php8.0-yaml \ - php8.0-geoip \ smbclient libsmbclient \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ diff --git a/linux/ecosystem/php/php8.1/Dockerfile b/linux/ecosystem/php/php8.1/Dockerfile index e59f2cb2c..02335867f 100644 --- a/linux/ecosystem/php/php8.1/Dockerfile +++ b/linux/ecosystem/php/php8.1/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php8.1 \ php8.1-common \ php8.1-dev \ @@ -36,7 +37,6 @@ RUN apt-get update && \ php8.1-fpm \ php8.1-imap \ php8.1-pspell \ - php8.1-recode \ php8.1-sqlite3 \ php8.1-pgsql \ php8.1-tidy \ @@ -48,7 +48,6 @@ RUN apt-get update && \ php8.1-cli \ php8.1-common \ php8.1-cgi \ - php8.1-json \ php8.1-readline \ php8.1-enchant \ php8.1-ssh2 \ @@ -57,7 +56,6 @@ RUN apt-get update && \ php8.1-redis \ php8.1-smbclient \ php8.1-yaml \ - php8.1-geoip \ smbclient libsmbclient \ sendmail && \ ln -sf /etc/ssl/dhparam.pem /etc/php/dhparam.pem && \ diff --git a/linux/ecosystem/php/php8.2/Dockerfile b/linux/ecosystem/php/php8.2/Dockerfile index e13462e11..894581005 100644 --- a/linux/ecosystem/php/php8.2/Dockerfile +++ b/linux/ecosystem/php/php8.2/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php8.2 \ php8.2-common \ php8.2-dev \ diff --git a/linux/ecosystem/php/php8.3/Dockerfile b/linux/ecosystem/php/php8.3/Dockerfile index 40d55e822..92f9dfbd8 100644 --- a/linux/ecosystem/php/php8.3/Dockerfile +++ b/linux/ecosystem/php/php8.3/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && \ apt-get install -y --allow-unauthenticated \ libmemcached-dev \ libgmp-dev \ + php-pear \ php8.3 \ php8.3-common \ php8.3-dev \