From a12bee2bad746e948edaa366fa730e960bf2b27c Mon Sep 17 00:00:00 2001 From: Alexandre Choura Date: Mon, 11 Dec 2023 17:37:26 +0100 Subject: [PATCH 1/2] ci: Handle new Alpine 3.19 Image --- dockerfiles/verify_packages/alpine/install.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dockerfiles/verify_packages/alpine/install.sh b/dockerfiles/verify_packages/alpine/install.sh index 8c79cba304..9274c3e392 100755 --- a/dockerfiles/verify_packages/alpine/install.sh +++ b/dockerfiles/verify_packages/alpine/install.sh @@ -63,6 +63,10 @@ WWW_CONF=/etc/php/php-fpm.d/www.conf if [ ! -f "${WWW_CONF}" ]; then WWW_CONF=/usr/local/etc/php-fpm.d/www.conf fi +if [ ! -f "${WWW_CONF}" ]; then + # Alpine 3.19 + WWW_CONF=/etc/php82/php-fpm.d/www.conf +fi if [ ! -f "${WWW_CONF}" ]; then # Alpine 3.17 WWW_CONF=/etc/php81/php-fpm.d/www.conf From 151e47edcf4e2c5bd60fa7f12ea264afa8a78f9b Mon Sep 17 00:00:00 2001 From: Alexandre Choura Date: Mon, 11 Dec 2023 17:40:31 +0100 Subject: [PATCH 2/2] ci: Handle new Alpine 3.19 PHP Binaries --- dockerfiles/verify_packages/alpine/install.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dockerfiles/verify_packages/alpine/install.sh b/dockerfiles/verify_packages/alpine/install.sh index 9274c3e392..49970e0d77 100755 --- a/dockerfiles/verify_packages/alpine/install.sh +++ b/dockerfiles/verify_packages/alpine/install.sh @@ -21,6 +21,9 @@ fi if [ -z "$PHP_BIN" ]; then PHP_BIN=$(command -v php81 || true) fi +if [ -z "$PHP_BIN" ]; then + PHP_BIN=$(command -v php82 || true) +fi if [ -z "$PHP_BIN" ]; then PHP_BIN=$(command -v php7 || true) fi @@ -46,6 +49,9 @@ cp $(pwd)/dockerfiles/verify_packages/nginx.conf /etc/nginx/nginx.conf if [ -z "$PHP_FPM_BIN" ]; then PHP_FPM_BIN=$(command -v php-fpm || true) fi +if [ -z "$PHP_FPM_BIN" ]; then + PHP_FPM_BIN=$(command -v php-fpm82 || true) +fi if [ -z "$PHP_FPM_BIN" ]; then PHP_FPM_BIN=$(command -v php-fpm81 || true) fi