PHP Version 7.4.3

Author: gegere

Dockerfile

@@ -15,7 +15,7 @@ RUN BUILD_DEPS='software-properties-common' \
         && add-apt-repository -y ppa:ondrej/php \
         && add-apt-repository -y ppa:ondrej/apache2 \
         && apt-get update \
-        && apt-get install -y curl apache2 libsasl2-modules libapache2-mod-php7.3 libmcrypt-dev php7.3-cli php7.3-dev php7.3-readline php7.3-mbstring php7.3-zip php7.3-intl php-xml php7.3-xml php7.3-xmlrpc php7.3-json php7.3-curl php7.3-gd php7.3-pgsql php7.3-mysql php-pear \
+        && apt-get install -y curl apache2 libsasl2-modules libapache2-mod-php7.4 libmcrypt-dev php7.4-cli php7.4-dev php7.4-readline php7.4-mbstring php7.4-zip php7.4-intl php-xml php7.4-xml php7.4-xmlrpc php7.4-json php7.4-curl php7.4-gd php7.4-pgsql php7.4-mysql php-pear \
     && apt-get update && apt-get install -yq --no-install-recommends \
         git \
         cron \

README.md

@@ -7,7 +7,7 @@
 [![Beerpay](https://beerpay.io/htmlgraphic/Apache/badge.svg?style=beer)](https://beerpay.io/htmlgraphic/Apache) [![Beerpay](https://beerpay.io/htmlgraphic/Apache/make-wish.svg?style=flat)](https://beerpay.io/htmlgraphic/Apache)
 
 
-This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP 7.3, PHP Composer, linked [MySQL 5.7.28](https://hub.docker.com/_/mysql) instance and a data container volume.
+This repo will give you a turn key Docker container build for use in **production** OR **dev**. The setup includes an Apache web service, PHP Version 7.4.3, PHP Composer, linked [MySQL 5.7.28](https://hub.docker.com/_/mysql) instance and a data container volume.
 
 Using containers offer a huge advantage when developing locally or in prodcution. Use this containers for development and deployment. Changing `NODE_ENVIRONMENT` within to `.env` to `dev` or `production` will offer a dynamic environment.
 

app/run.sh

@@ -72,54 +72,54 @@ fi
 #  Route mail to SMTP queuing servers
 #
 #####
-if [ ! -f /etc/php/7.3/apache2/build ]; then
+if [ ! -f /etc/php/7.4/apache2/build ]; then
 
 	# Tweak Apache build
-	sed -i 's|;include_path = ".:/usr/share/php"|include_path = ".:/usr/share/php:/data/pear"|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's/variables_order.*/variables_order = \"EGPCS\"/g' /etc/php/7.3/apache2/php.ini
+	sed -i 's|;include_path = ".:/usr/share/php"|include_path = ".:/usr/share/php:/data/pear"|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's/variables_order.*/variables_order = \"EGPCS\"/g' /etc/php/7.4/apache2/php.ini
 	sed -i 's/IncludeOptional sites-enabled\/\*.conf/IncludeOptional \/data\/apache2\/sites-enabled\/*.conf/' /etc/apache2/apache2.conf
-	sed -i 's|;error_log = php_errors.log|error_log = /data/apache2/logs/error_log|g' /etc/php/7.3/apache2/php.ini
-	echo "extension=mcrypt.so" > /etc/php/7.3/apache2/conf.d/mcrypt.ini
+	sed -i 's|;error_log = php_errors.log|error_log = /data/apache2/logs/error_log|g' /etc/php/7.4/apache2/php.ini
+	echo "extension=mcrypt.so" > /etc/php/7.4/apache2/conf.d/mcrypt.ini
 
 	# Update the PHP.ini file, enable <? ?> tags and quiet logging.
-	sed -i 's|short_open_tag = Off|short_open_tag = On|g' /etc/php/7.3/apache2/php.ini
+	sed -i 's|short_open_tag = Off|short_open_tag = On|g' /etc/php/7.4/apache2/php.ini
 
 	# Sessions & garbage collection
-	sed -i 's|;session.save_path = "/var/lib/php5"|session.save_path = "/tmp"|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's|session.gc_probability = 0|session.gc_probability = 1|g' /etc/php/7.3/apache2/php.ini
+	sed -i 's|;session.save_path = "/var/lib/php5"|session.save_path = "/tmp"|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's|session.gc_probability = 0|session.gc_probability = 1|g' /etc/php/7.4/apache2/php.ini
 
 	# Update Apache / PHP Config
-	sed -i 's|max_execution_time = 30|max_execution_time = 300|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.3/apache2/php.ini
-	sed -i 's|max_input_time = 60|max_input_time = 300|g' /etc/php/7.3/apache2/php.ini
+	sed -i 's|max_execution_time = 30|max_execution_time = 300|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.4/apache2/php.ini
+	sed -i 's|max_input_time = 60|max_input_time = 300|g' /etc/php/7.4/apache2/php.ini
 
 	# Update CLI Config
-	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.3/cli/php.ini
-	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.3/cli/php.ini
-	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.3/cli/php.ini
+	sed -i 's|memory_limit = 128M|memory_limit = -1|g' /etc/php/7.4/cli/php.ini
+	sed -i 's|upload_max_filesize = 2M|upload_max_filesize = 1000M|g' /etc/php/7.4/cli/php.ini
+	sed -i 's|post_max_size = 8M|post_max_size = 1000M|g' /etc/php/7.4/cli/php.ini
 
 
 	# Add build file to remove duplicate script execution
-	echo 1 > /etc/php/7.3/apache2/build
+	echo 1 > /etc/php/7.4/apache2/build
 
 	if [[ -z "${NODE_ENVIRONMENT}" ]]; then
 			# $NODE_ENVIRONMENT is set on container creation
 			echo "	env NODE_ENVIRONMENT is not set, Apache is not configured correctly."
 	else
 		if [ "$NODE_ENVIRONMENT" == 'dev' ]; then
 			# Tweak Apache build
-			sed -i 's|\[PHP\]|\[PHP\] \nIS_LIVE=0 \nIS_DEV=1 \nNODE_ENVIRONMENT=dev \n;The IS_DEV is set for testing outside of DEV environments ie: test.domain.tld|g' /etc/php/7.3/apache2/php.ini
+			sed -i 's|\[PHP\]|\[PHP\] \nIS_LIVE=0 \nIS_DEV=1 \nNODE_ENVIRONMENT=dev \n;The IS_DEV is set for testing outside of DEV environments ie: test.domain.tld|g' /etc/php/7.4/apache2/php.ini
 			# Update the PHP.ini file, enable <? ?> tags and quiet logging.
-			sed -i "s/error_reporting = .*$/error_reporting = E_ALL/" /etc/php/7.3/apache2/php.ini
+			sed -i "s/error_reporting = .*$/error_reporting = E_ALL/" /etc/php/7.4/apache2/php.ini
 		fi
 
 		if [ "$NODE_ENVIRONMENT" == 'production' ]; then
 			# Tweak Apache build
-			sed -i 's|\[PHP\]|\[PHP\] \nIS_LIVE=1 \nIS_DEV=0 \nNODE_ENVIRONMENT=production \n;The IS_DEV is set for testing outside of DEV environments ie: test.domain.tld|g' /etc/php/7.3/apache2/php.ini
+			sed -i 's|\[PHP\]|\[PHP\] \nIS_LIVE=1 \nIS_DEV=0 \nNODE_ENVIRONMENT=production \n;The IS_DEV is set for testing outside of DEV environments ie: test.domain.tld|g' /etc/php/7.4/apache2/php.ini
 			# Update the PHP.ini file, enable <? ?> tags and quiet logging.
-			sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PARSE/" /etc/php/7.3/apache2/php.ini
+			sed -i "s/error_reporting = .*$/error_reporting = E_ERROR | E_WARNING | E_PARSE/" /etc/php/7.4/apache2/php.ini
 		fi
 
 	fi

docker-compose.local.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   web:
-    image: 'htmlgraphic/apache:latest' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
+    image: 'htmlgraphic/apache:latest'
     container_name: apache
     volumes:
       - '~/SITES/docker:/data' # <- Change to preferred local working dir

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   web:
-    image: 'htmlgraphic/apache:envoyer' # PHP v7.3.2-3+ubuntu18.04.1+deb.sury.org+1
+    image: 'htmlgraphic/apache:envoyer'
     ports:
       - "80:80"
       - "443:443"

tests/build_tests.sh

@@ -100,7 +100,7 @@ testCLI_max_input_time()
 
 testApache_max_execution_time()
 {
-	max_execution_time=$(cat /etc/php/7.3/apache2/php.ini | grep 'max_execution_time')
+	max_execution_time=$(cat /etc/php/7.4/apache2/php.ini | grep 'max_execution_time')
 	echo 'Test max_execution_time, currently set to "'$max_execution_time'"'
 	test=$(echo $max_execution_time | grep 'max_execution_time = 300' | wc -l)
 	assertEquals 1 $test
@@ -109,7 +109,7 @@ testApache_max_execution_time()
 
 testApache_MemoryLimit()
 {
-	memory_limit=$(cat /etc/php/7.3/apache2/php.ini | grep 'memory_limit')
+	memory_limit=$(cat /etc/php/7.4/apache2/php.ini | grep 'memory_limit')
 	echo 'Test memory_limit, currently set to "'$memory_limit'"'
 	test=$(echo $memory_limit | grep 'memory_limit = -1' | wc -l)
 	assertEquals 1 $test
@@ -118,7 +118,7 @@ testApache_MemoryLimit()
 
 testApache_upload_max_filesize()
 {
-	upload_max_filesize=$(cat /etc/php/7.3/apache2/php.ini | grep 'upload_max_filesize')
+	upload_max_filesize=$(cat /etc/php/7.4/apache2/php.ini | grep 'upload_max_filesize')
 	echo 'Test upload_max_filesize, currently set to "'$upload_max_filesize'"'
 	test=$(echo $upload_max_filesize | grep 'upload_max_filesize = 1000M' | wc -l)
 	assertEquals 1 $test
@@ -127,7 +127,7 @@ testApache_upload_max_filesize()
 
 testApache_post_max_size()
 {
-	post_max_size=$(cat /etc/php/7.3/apache2/php.ini | grep 'post_max_size')
+	post_max_size=$(cat /etc/php/7.4/apache2/php.ini | grep 'post_max_size')
 	echo 'Test post_max_size, currently set to "'$post_max_size'"'
 	test=$(echo $post_max_size | grep 'post_max_size = 1000M' | wc -l)
 	assertEquals 1 $test
@@ -136,7 +136,7 @@ testApache_post_max_size()
 
 testApache_max_input_time()
 {
-	max_input_time=$(cat /etc/php/7.3/apache2/php.ini | grep 'max_input_time')
+	max_input_time=$(cat /etc/php/7.4/apache2/php.ini | grep 'max_input_time')
 	echo 'Test max_input_time, currently set to "'$max_input_time'"'
 	test=$(echo $max_input_time | grep 'max_input_time = 300' | wc -l)
 	assertEquals 1 $test