Skip to content

Commit 0f0c13a

Browse files
authored
fix verify alpine CI jobs (#3588)
Signed-off-by: Alexandre Rulleau <[email protected]>
1 parent e9fe5d9 commit 0f0c13a

File tree

1 file changed

+22
-2
lines changed

1 file changed

+22
-2
lines changed

dockerfiles/verify_packages/alpine/install.sh

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,20 @@ if [ -z "$PHP_BIN" ]; then
1919
PHP_BIN=$(command -v php8 || true)
2020
fi
2121
if [ -z "$PHP_BIN" ]; then
22-
PHP_BIN=$(command -v php81 || true)
22+
PHP_BIN=$(command -v php85 || true)
2323
fi
2424
if [ -z "$PHP_BIN" ]; then
25-
PHP_BIN=$(command -v php82 || true)
25+
PHP_BIN=$(command -v php84 || true)
2626
fi
2727
if [ -z "$PHP_BIN" ]; then
2828
PHP_BIN=$(command -v php83 || true)
2929
fi
30+
if [ -z "$PHP_BIN" ]; then
31+
PHP_BIN=$(command -v php82 || true)
32+
fi
33+
if [ -z "$PHP_BIN" ]; then
34+
PHP_BIN=$(command -v php81 || true)
35+
fi
3036
if [ -z "$PHP_BIN" ]; then
3137
PHP_BIN=$(command -v php7 || true)
3238
fi
@@ -52,6 +58,12 @@ cp $(pwd)/dockerfiles/verify_packages/nginx.conf /etc/nginx/nginx.conf
5258
if [ -z "$PHP_FPM_BIN" ]; then
5359
PHP_FPM_BIN=$(command -v php-fpm || true)
5460
fi
61+
if [ -z "$PHP_FPM_BIN" ]; then
62+
PHP_FPM_BIN=$(command -v php-fpm85 || true)
63+
fi
64+
if [ -z "$PHP_FPM_BIN" ]; then
65+
PHP_FPM_BIN=$(command -v php-fpm84 || true)
66+
fi
5567
if [ -z "$PHP_FPM_BIN" ]; then
5668
PHP_FPM_BIN=$(command -v php-fpm83 || true)
5769
fi
@@ -75,6 +87,14 @@ WWW_CONF=/etc/php/php-fpm.d/www.conf
7587
if [ ! -f "${WWW_CONF}" ]; then
7688
WWW_CONF=/usr/local/etc/php-fpm.d/www.conf
7789
fi
90+
if [ ! -f "${WWW_CONF}" ]; then
91+
# Alpine 3.22+
92+
WWW_CONF=/etc/php85/php-fpm.d/www.conf
93+
fi
94+
if [ ! -f "${WWW_CONF}" ]; then
95+
# Alpine 3.21
96+
WWW_CONF=/etc/php84/php-fpm.d/www.conf
97+
fi
7898
if [ ! -f "${WWW_CONF}" ]; then
7999
# Alpine 3.20
80100
WWW_CONF=/etc/php83/php-fpm.d/www.conf

0 commit comments

Comments
 (0)