WIP set up php 5.4, 5.5 in test container

diff --git a/tests/ci/config/apache_phpfpm_proxyfcgi b/tests/ci/config/apache_phpfpm_proxyfcgi
index 8bed636..99aea81 100644 (file)
--- a/tests/ci/config/apache_phpfpm_proxyfcgi
+++ b/tests/ci/config/apache_phpfpm_proxyfcgi
@@ -3,6 +3,7 @@
 # Redirect to local php-fpm if mod_php is not available
 <IfModule !mod_php8.c>
 <IfModule !mod_php7.c>
+<IfModule !mod_php5.c>
 <IfModule proxy_fcgi_module>
     # Enable http authorization headers
     <IfModule setenvif_module>
@@ -25,3 +26,4 @@
 </IfModule>
 </IfModule>
 </IfModule>
+</IfModule>

diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh
index 70fb378..76abed6 100755 (executable)
--- a/tests/ci/setup/setup_php.sh
+++ b/tests/ci/setup/setup_php.sh
@@ -8,6 +8,8 @@
 
 set -e
 
+SCRIPT_DIR="$(dirname -- "$(readlink -f "$0")")"
+
 configure_php_ini() {
     # note: these settings are not required for cli config
     echo "cgi.fix_pathinfo = 1" >> "${1}"
@@ -71,6 +73,10 @@ else
         curl -sSL https://github.com/shivammathur/php5-ubuntu/releases/latest/download/install.sh | bash -s "${PHP_VERSION}"
         # we have to do this as the init script we get for starting/stopping php-fpm seems to be faulty...
         pkill php-fpm
+        echo 'listen = /run/php/php-fpm.sock' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf"
+        echo 'listen.owner = docker' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf"
+        echo 'listen.group = docker' >> "/usr/local/php/${PHP_VERSION}/etc/php-fpm.conf"
+        cp "$SCRIPT_DIR/../config/apache_phpfpm_proxyfcgi" "/etc/apache2/conf-available/php${PHP_VERSION}-fpm.conf"
     else
         DEBIAN_FRONTEND=noninteractive apt-get install -y language-pack-en-base software-properties-common
         LC_ALL=en_US.UTF-8 add-apt-repository ppa:ondrej/php