From d0fb6704f1bf962fdc57de89594f8b433ca02f8c Mon Sep 17 00:00:00 2001 From: gggeek Date: Wed, 23 Nov 2022 12:42:51 +0000 Subject: [PATCH] WIP set up php 5.4, 5.5 in test container --- tests/ci/config/apache_phpfpm_proxyfcgi | 2 ++ tests/ci/setup/setup_php.sh | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/tests/ci/config/apache_phpfpm_proxyfcgi b/tests/ci/config/apache_phpfpm_proxyfcgi index 8bed636a..99aea812 100644 --- 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 + # Enable http authorization headers @@ -25,3 +26,4 @@ + diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh index 70fb3780..76abed6f 100755 --- 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 -- 2.47.0