dockerfile adds, PHPRedis added to build

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:deadsnakes/ppa
 
-RUN apt update && apt install -y python3.7 python3-pip 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 php7.4-xml php7.4-bcmath php7.4-xmlrpc php7.4-json php7.4-curl php7.4-gd php7.4-pgsql php7.4-mysql php-pear \
+RUN apt update && apt install -y python3.7 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 php7.4-xml php7.4-bcmath php7.4-xmlrpc php7.4-json php7.4-curl php7.4-gd php7.4-pgsql php7.4-mysql php-pear \
     && apt update && apt install -yq --no-install-recommends \
         git \
         cron \
@@ -37,9 +37,8 @@ RUN apt update && apt install -y python3.7 python3-pip curl apache2 libsasl2-mod
     && apt autoremove -y \
     && rm -rf /var/lib/apt/lists/* \
     && pecl channel-update pecl.php.net \
-    && pecl install mcrypt-1.0.3 -y
-
-RUN python3 -m pip install certbot-dns-cloudflare
+    && pecl install mcrypt-1.0.3 \
+    && pecl install redis -y
 
 # POSTFIX
 RUN update-locale LANG=en_US.UTF-8
@@ -59,7 +58,7 @@ RUN chmod -R 755 /opt/* \
     && cp /opt/app/supervisord /etc/supervisor/conf.d/supervisord.conf
 
 # COMPOSER
-RUN curl -sS https://getcomposer.org/installer | php && mv composer.phar /usr/local/bin/composer
+COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
 RUN composer global require "laravel/installer"
 RUN composer global require "vlucas/phpdotenv"
 

app/php_extensions.php

@@ -6,7 +6,7 @@
 	header('Content-Type: text/plain; charset=utf-8');
 
 	// The following modules, should exist in the build
-	$modules = 'apache2handler,calendar,ctype,curl,date,dom,exif,fileinfo,filter,ftp,gd,gettext,hash,iconv,imagick,json,libxml,mbstring,mcrypt,mysqli,mysqlnd,openssl,pcre,pdo,pdo_mysql,phar,posix,readline,reflection,session,shmop,simplexml,sockets,spl,standard,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,opcache.enable,zip,zlib, mod_deflate, mod_filter';
+	$modules = 'apache2handler,calendar,ctype,curl,date,dom,exif,fileinfo,filter,ftp,gd,gettext,hash,iconv,imagick,json,libxml,mbstring,mcrypt,mysqli,mysqlnd,openssl,pcre,pdo,pdo_mysql,phar,posix,readline,reflection,redis,session,shmop,simplexml,sockets,spl,standard,sysvmsg,sysvsem,sysvshm,tokenizer,xml,xmlreader,xmlwriter,xsl,opcache.enable,zip,zlib,mod_deflate,mod_filter';
 
 	$mods_check = array_map('trim', explode(",",$modules));
 

app/run.sh

@@ -75,14 +75,19 @@ fi
 #####
 if [ ! -f /etc/php/7.4/apache2/build ]; then
 
-	# Tweak Apache build
+	# Tweak Apache Build
 	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.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.
+	# Setup Redis
+	echo "extension=redis.so" > /etc/php/7.4/mods-available/redis.ini
+	ln -sf /etc/php/7.4/mods-available/redis.ini /etc/php/7.4/cli/conf.d/20-redis.ini
+	ln -sf /etc/php/7.4/mods-available/redis.ini /etc/php/7.4/apache2/conf.d/20-redis.ini
+
+	# Update the PHP.ini file, enable <? ?> tags
 	sed -i 's|short_open_tag = Off|short_open_tag = On|g' /etc/php/7.4/apache2/php.ini
 
 	# Sessions & garbage collection
@@ -112,15 +117,17 @@ if [ ! -f /etc/php/7.4/apache2/build ]; then
 		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.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.4/apache2/php.ini
+			# Log errors into log files
+			sed -i 's/error_reporting = .*$/error_reporting = E_ALL/' /etc/php/7.4/apache2/php.ini
+			# Default is 1024 and 0 allows to not apply any maximum length at all
+			sed -i 's|log_errors_max_len = 1024|log_errors_max_len = 0|g' /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.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.4/apache2/php.ini
+			# Log errors into log files
+			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

@@ -2,6 +2,7 @@ version: '3.3'
 services:
   web:
     image: 'htmlgraphic/apache:latest'
+    restart: unless-stopped
     container_name: apache
     volumes:
       - '~/SITES/docker:/data' # <- Change to preferred local working dir

tests/cli_php_modules

@@ -24,6 +24,7 @@ pdo
 pdo_mysql
 phar
 posix
+redis
 readline
 session
 shmop

tests/php_modules

@@ -26,6 +26,7 @@ pdo
 pdo_mysql
 phar
 posix
+redis
 readline
 reflection
 session