-
Notifications
You must be signed in to change notification settings - Fork 34
Add PCOV to PHP 8.0-8.5 images #210
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: trunk
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,6 +30,7 @@ RUN set -ex; \ | |
| pecl install imagick; \ | ||
| docker-php-ext-enable imagick; \ | ||
| pecl install xdebug-3.1.6; \ | ||
| pecl install pcov; \ | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This also adds PCOV to PHP 7.4, while the PR title still says PHP 8.0–8.5. Could we update the title to 7.4–8.5 so the scope matches the code and description? |
||
| pecl install memcached-3.3.0; \ | ||
| \ | ||
| curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \ | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -30,7 +30,7 @@ | |
| 'base_name' => 'php:7.4-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'memcached-3.3.0' ), | ||
| 'pecl_extensions' => array( 'imagick', 'xdebug-3.1.6', 'pcov', 'memcached-3.3.0' ), | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we pin this to |
||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -43,7 +43,7 @@ | |
| 'base_name' => 'php:8.0-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -56,7 +56,7 @@ | |
| 'base_name' => 'php:8.1-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -69,7 +69,7 @@ | |
| 'base_name' => 'php:8.2-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -82,7 +82,7 @@ | |
| 'base_name' => 'php:8.3-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -95,7 +95,7 @@ | |
| 'base_name' => 'php:8.4-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ), | ||
| 'extensions' => array( 'gd', 'opcache', 'mysqli', 'zip', 'exif', 'intl', 'mbstring', 'xml', 'xsl' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'imagick', 'memcached-3.4.0', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
@@ -108,7 +108,7 @@ | |
| 'base_name' => 'php:8.5-fpm', | ||
| 'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libavif-dev', 'libaom-dev', 'libdav1d-dev', 'libheif-dev', 'libzip-dev', 'libssl-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync' ), | ||
| 'extensions' => array( 'gd', 'mysqli', 'zip', 'exif', 'intl', 'mbstring' ), | ||
| 'pecl_extensions' => array( 'memcached-3.4.0', 'imagick', 'xdebug-3.5.3' ), | ||
| 'pecl_extensions' => array( 'memcached-3.4.0', 'imagick', 'pcov', 'xdebug-3.5.3' ), | ||
| 'composer' => true, | ||
| ), | ||
| 'cli' => array( | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we make PCOV and Xdebug mutually exclusive here? If both
LOCAL_PHP_PCOVandLOCAL_PHP_XDEBUGare true, the earlier block enables Xdebug and this block then enables PCOV. PCOV documents that the two cannot interoperate when PCOV is enabled: https://github.com/krakjoe/pcov#interoperability. Disabling Xdebug here or failing clearly would prevent an invalid runtime configuration.