Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions entrypoint/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov

Copy link
Copy Markdown
Member

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_PCOV and LOCAL_PHP_XDEBUG are 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.

else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/7.4/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install xdebug-3.1.6; \
pecl install pcov; \

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The 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; \
Expand Down
11 changes: 11 additions & 0 deletions images/7.4/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.0/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install memcached-3.4.0; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.0/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.1/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install memcached-3.4.0; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.1/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.2/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install memcached-3.4.0; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.2/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.3/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install memcached-3.4.0; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.3/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.4/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install memcached-3.4.0; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.4/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
1 change: 1 addition & 0 deletions images/8.5/php/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN set -ex; \
pecl install memcached-3.4.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
pecl install pcov; \
pecl install xdebug-3.5.3; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
11 changes: 11 additions & 0 deletions images/8.5/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
11 changes: 11 additions & 0 deletions images/8.6/php/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-memcached.ini
fi

# If LOCAL_PHP_PCOV=true the PCOV extension will be enabled.
if [ "$LOCAL_PHP_PCOV" = true ]; then
if extension_available "pcov"; then
docker-php-ext-enable pcov
else
echo "Warning: PCOV extension not available, skipping..."
fi
else
rm -f /usr/local/etc/php/conf.d/docker-php-ext-pcov.ini
fi

### Change UID/GID
WP_PHP_UID="${PHP_FPM_UID-1000}"
WP_PHP_GID="${PHP_FPM_GID-1000}"
Expand Down
14 changes: 7 additions & 7 deletions update.php
Original file line number Diff line number Diff line change
Expand Up @@ -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' ),

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we pin this to pcov-1.0.12 for reproducible rebuilds? The linked wordpress-develop work already made that choice after reviewing the same floating-version risk: WordPress/wordpress-develop#11618 (comment). Version 1.0.12 is the current stable PECL release and supports PHP 7.1+: https://pecl.php.net/package/pcov.

'composer' => true,
),
'cli' => array(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand Down
Loading