From cd891b87793842aef922eb03a443c80b73b0cf5e Mon Sep 17 00:00:00 2001
From: STAM <developer@epicm.org>
Date: Thu, 28 Jan 2021 00:57:33 +0300
Subject: [PATCH] splited php image from websites

---
 epicmorg/prod/main/Dockerfile |  4 ++++
 php/latest/Dockerfile         | 18 +++++++-----------
 php/php7.4/Dockerfile         | 18 +++++++-----------
 websites/latest/Dockerfile    |  4 ++--
 websites/php7.4/Dockerfile    |  6 +++---
 5 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/epicmorg/prod/main/Dockerfile b/epicmorg/prod/main/Dockerfile
index 720aa6ffa..9164ffedf 100644
--- a/epicmorg/prod/main/Dockerfile
+++ b/epicmorg/prod/main/Dockerfile
@@ -18,6 +18,10 @@ RUN for i in $(seq 1 8); do mkdir -p "/usr/share/man/man${i}"; done
 ARG P4_VERSION=r20.2
 ARG P4_DOWNLOAD_URL=http://www.perforce.com/downloads/perforce/${P4_VERSION}/bin.linux26x86_64/p4
 
+##################################################################
+#                   LDAP Fix
+##################################################################
+RUN echo "TLS_REQCERT never" >> /etc/ldap/ldap.conf
 
 ##################################################################
 #                   installing utils
diff --git a/php/latest/Dockerfile b/php/latest/Dockerfile
index 93682d932..a4626a47d 100644
--- a/php/latest/Dockerfile
+++ b/php/latest/Dockerfile
@@ -92,10 +92,6 @@ ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
 RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
 RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
 #Install base packages
 RUN apt-get update && \
     apt-get install -y  --allow-unauthenticated \
@@ -189,13 +185,13 @@ RUN apt-get update && \
 ##################################################################
 #                   Installing IOnCube addon
 ##################################################################
-ADD https://www.ioncube.com/php-7.4.0-beta-loaders/ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz /tmp/ioncube.tar.gz
+ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz
 RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \
-    cp /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so /usr/lib/php/20170718/ && \
-#    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/apache2/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cgi/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cli/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/fpm/php.ini && \
+    cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \
+#    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \
     php -m && \
     php -v
 
@@ -226,7 +222,7 @@ RUN apt clean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb && \
     rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/ioncube/* && \
     rm -rfv /tmp/composer-setup.php && \
-    rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \
     rm -rfv /tmp/ioncube.tar.gz
 
diff --git a/php/php7.4/Dockerfile b/php/php7.4/Dockerfile
index 93682d932..a4626a47d 100644
--- a/php/php7.4/Dockerfile
+++ b/php/php7.4/Dockerfile
@@ -92,10 +92,6 @@ ARG P4_PHP_INI=${PHP_DIR}/mods-available/perfroce.ini
 RUN wget -O /etc/apt/trusted.gpg.d/php.gpg https://packages.sury.org/php/apt.gpg
 RUN sh -c 'echo "deb https://packages.sury.org/php/ buster main" > /etc/apt/sources.list.d/php.list'
 
-#installing apache2 repo
-RUN wget -O /etc/apt/trusted.gpg.d/apache2.gpg https://packages.sury.org/apache2/apt.gpg
-RUN sh -c 'echo "deb https://packages.sury.org/apache2/ buster main" > /etc/apt/sources.list.d/apache2.list'
-
 #Install base packages
 RUN apt-get update && \
     apt-get install -y  --allow-unauthenticated \
@@ -189,13 +185,13 @@ RUN apt-get update && \
 ##################################################################
 #                   Installing IOnCube addon
 ##################################################################
-ADD https://www.ioncube.com/php-7.4.0-beta-loaders/ioncube_loaders_lin_x86-64_7.4_BETA2.tar.gz /tmp/ioncube.tar.gz
+ADD https://downloads.ioncube.com/loader_downloads/ioncube_loaders_lin_x86-64.tar.gz /tmp/ioncube.tar.gz
 RUN tar -C /tmp -xvf /tmp/ioncube.tar.gz && \
-    cp /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so /usr/lib/php/20170718/ && \
-#    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/apache2/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cgi/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/cli/php.ini && \
-    echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/fpm/php.ini && \
+    cp /tmp/ioncube/ioncube_loader_lin_7.4.so ${PHP_MODULE_PATH} && \
+#    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cgi/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/cli/php.ini && \
+    echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/fpm/php.ini && \
     php -m && \
     php -v
 
@@ -226,7 +222,7 @@ RUN apt clean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb && \
     rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/ioncube/* && \
     rm -rfv /tmp/composer-setup.php && \
-    rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \
     rm -rfv /tmp/ioncube.tar.gz
 
diff --git a/websites/latest/Dockerfile b/websites/latest/Dockerfile
index c4a333354..be6ff446f 100644
--- a/websites/latest/Dockerfile
+++ b/websites/latest/Dockerfile
@@ -50,7 +50,7 @@ RUN apt-get update && \
 ##################################################################
 #                   Installing IOnCube addon
 ##################################################################
-RUN echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/apache2/php.ini && \
+RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
     php -m && \
     php -v
 
@@ -69,8 +69,8 @@ RUN apt clean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb && \
     rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/ioncube/* && \
     rm -rfv /tmp/composer-setup.php && \
-    rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \
     rm -rfv /tmp/ioncube.tar.gz
 
 #volumes
diff --git a/websites/php7.4/Dockerfile b/websites/php7.4/Dockerfile
index c4a333354..4e90e0148 100644
--- a/websites/php7.4/Dockerfile
+++ b/websites/php7.4/Dockerfile
@@ -1,4 +1,4 @@
-FROM epicmorg/php:latest
+FROM epicmorg/php:php7.4
 LABEL maintainer="EpicMorg DevTeam, developer@epicm.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
@@ -50,7 +50,7 @@ RUN apt-get update && \
 ##################################################################
 #                   Installing IOnCube addon
 ##################################################################
-RUN echo "zend_extension = /usr/lib/php/20170718/ioncube_loader_lin_7.4_10.4.0_beta2.so" >> /etc/php/7.4/apache2/php.ini && \
+RUN echo "zend_extension = ${PHP_MODULE_PATH}/ioncube_loader_lin_7.4.so" >> ${PHP_DIR}/apache2/php.ini && \
     php -m && \
     php -v
 
@@ -69,8 +69,8 @@ RUN apt clean -y && \
     rm -rfv /var/lib/apt/lists/* && \
     rm -rfv /var/cache/apt/archives/*.deb && \
     rm -rfv /tmp/deb/* && \
+    rm -rfv /tmp/ioncube/* && \
     rm -rfv /tmp/composer-setup.php && \
-    rm -rfv /tmp/ioncube_loader_lin_7.4_10.4.0_beta2.so && \
     rm -rfv /tmp/ioncube.tar.gz
 
 #volumes