diff --git a/8.5-fpm/Dockerfile b/8.5-fpm/Dockerfile index a1630fc..022b1bd 100644 --- a/8.5-fpm/Dockerfile +++ b/8.5-fpm/Dockerfile @@ -41,6 +41,7 @@ RUN apt update && apt dist-upgrade -y && \ php8.5-mbstring \ php8.5-memcached \ php8.5-mysql \ + php8.5-pcov \ php8.5-pdo \ php8.5-pgsql \ php8.5-soap \ diff --git a/8.5/Dockerfile b/8.5/Dockerfile index 55a6012..d0a848d 100644 --- a/8.5/Dockerfile +++ b/8.5/Dockerfile @@ -37,6 +37,7 @@ RUN apt update && apt dist-upgrade -y && \ php8.5-mbstring \ php8.5-memcached \ php8.5-mysql \ + php8.5-pcov \ php8.5-pdo \ php8.5-pgsql \ php8.5-soap \ diff --git a/Makefile b/Makefile index a360d3d..f6c8e07 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ DOCKER_IMAGE=dockette/php DOCKER_PLATFORM?=linux/amd64 VERSION?=8.5 -.PHONY: build test run test-cli-% test-fpm-% +.PHONY: build test run test-cli-% test-fpm-% test-pcov-% build: build-${VERSION} @@ -47,6 +47,13 @@ build-8.5-fpm: _build-8.5-fpm test-cli-%: docker run --rm ${DOCKER_IMAGE}:$* sh -lc 'php -v && composer --version' + ${MAKE} test-pcov-$* test-fpm-%: docker run --rm ${DOCKER_IMAGE}:$*-fpm sh -lc 'php -v && composer --version && php-fpm$* -t' + ${MAKE} test-pcov-$*-fpm + +# pcov requires PHP >= 7.1, older images are expected not to have it +test-pcov-%: + docker run --rm ${DOCKER_IMAGE}:$* php -r 'exit(PHP_VERSION_ID < 70100 || extension_loaded("pcov") ? 0 : 1);' \ + || { echo "ERROR: pcov is not loaded in ${DOCKER_IMAGE}:$*" >&2; exit 1; } diff --git a/README.md b/README.md index 16d16de..78a20b0 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ These images have preinstalled a couple of PHP extensions. The table shows which | mcrypt | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | ❌ | | memcached | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | mysql | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | -| pcov | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | +| pcov | ❌ | ❌ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | pdo | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | pgsql | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | | redis | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | ❌ |