Skip to content

Commit cd9dd42

Browse files
authored
Merge pull request #579 from webdevops/copilot/cleanup-tests-for-php-8-only
Modernize PHP 8 tests and fix extension and FPM provisioning
2 parents d786a2b + a8cffc7 commit cd9dd42

58 files changed

Lines changed: 297 additions & 560 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docker/php-apache-dev/8.1-alpine/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.1/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.2-alpine/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.2/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.3-alpine/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.3/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.4-alpine/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.4/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.5-alpine/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

‎docker/php-apache-dev/8.5/conf/provision/bootstrap.d/10-php.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
# listen on public IPv6 port
1919
go-replace --mode=line --regex \
2020
-s '^[\s;]*listen[\s]*=' -r 'listen = [::]:9000' \
21-
-- /opt/docker/etc/php/fpm/pool.d/application.conf \
22-
/opt/docker/etc/php/fpm/php-fpm.conf
21+
--path=/opt/docker/etc/php/fpm/ \
22+
--path-pattern='*.conf'
2323

2424
fi

0 commit comments

Comments
 (0)