Skip to content

Commit

Permalink
Add memcached to PHP 8.3/8.4 and update everywhere else (#158)
Browse files Browse the repository at this point in the history 
* Add memcached to PHP 8.3 and update everywhere else.

* Undo legacy container changes and try 3.2.0 for PHP 8.3.

* Try installing `libssl-dev`.

* Switch back to 3.3.0. Add to PHP 8.4.

* Also add `libssl-dev` to 8.4.

---------

Co-authored-by: desrosj <[email protected]>
  • Loading branch information
@desrosj
desrosj and desrosj authored Dec 4, 2024
1 parent 4202f99 commit e23d5b0
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 18 deletions.
2 changes: 1 addition & 1 deletion images/7.2/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN set -ex; \
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install xdebug-3.1.6; \
pecl install memcached-3.1.5; \
pecl install memcached-3.3.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
\
Expand Down
2 changes: 1 addition & 1 deletion images/7.3/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN set -ex; \
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install xdebug-3.1.6; \
pecl install memcached-3.1.5; \
pecl install memcached-3.3.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
\
Expand Down
2 changes: 1 addition & 1 deletion images/7.4/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RUN set -ex; \
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install xdebug-3.1.6; \
pecl install memcached-3.1.5; \
pecl install memcached-3.3.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
\
Expand Down
2 changes: 1 addition & 1 deletion images/8.0/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN set -ex; \
\
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install memcached-3.2.0; \
pecl install memcached-3.3.0; \
pecl install xdebug-3.4.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
Expand Down
2 changes: 1 addition & 1 deletion images/8.1/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN set -ex; \
\
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install memcached-3.2.0; \
pecl install memcached-3.3.0; \
pecl install xdebug-3.4.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
Expand Down
2 changes: 1 addition & 1 deletion images/8.2/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN set -ex; \
\
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install memcached-3.2.0; \
pecl install memcached-3.3.0; \
pecl install xdebug-3.4.0; \
pecl install imagick; \
docker-php-ext-enable imagick; \
Expand Down
3 changes: 2 additions & 1 deletion images/8.3/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN set -ex; \
\
apt-get update; \
\
apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \
apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \
apt-get upgrade openssl -y; \
update-ca-certificates --fresh; \
sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \
Expand All @@ -27,6 +27,7 @@ RUN set -ex; \
\
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install memcached-3.3.0; \
pecl install xdebug-3.4.0; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
3 changes: 2 additions & 1 deletion images/8.4/php/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ RUN set -ex; \
\
apt-get update; \
\
apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \
apt-get install -y --no-install-recommends libjpeg-dev libpng-dev libwebp-dev libzip-dev libssl-dev libmemcached-dev unzip libmagickwand-dev ghostscript libonig-dev locales sudo rsync libxslt-dev git; \
apt-get upgrade openssl -y; \
update-ca-certificates --fresh; \
sed -i 's/^# *\(\(ru_RU\|fr_FR\|de_DE\|es_ES\|ja_JP\).UTF-8\)/\1/' /etc/locale.gen; \
Expand All @@ -27,6 +27,7 @@ RUN set -ex; \
\
docker-php-ext-install gd opcache mysqli zip exif intl mbstring xml xsl; \
\
pecl install memcached-3.3.0; \
pecl install xdebug-3.4.0; \
\
curl --silent --fail --location --retry 3 --output /tmp/installer.php --url https://getcomposer.org/installer; \
Expand Down
20 changes: 10 additions & 10 deletions update.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
'base_name' => 'php:7.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( 'xdebug-3.1.6', 'memcached-3.1.5', 'imagick' ),
'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 7,
Expand All @@ -46,7 +46,7 @@
'base_name' => 'php:7.3-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( 'xdebug-3.1.6', 'memcached-3.1.5', 'imagick' ),
'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 7,
Expand All @@ -60,7 +60,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( 'xdebug-3.1.6', 'memcached-3.1.5', 'imagick' ),
'pecl_extensions' => array( 'xdebug-3.1.6', 'memcached-3.3.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 7,
Expand All @@ -74,7 +74,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( 'memcached-3.2.0', 'xdebug-3.4.0', 'imagick' ),
'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 9,
Expand All @@ -88,7 +88,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( 'memcached-3.2.0', 'xdebug-3.4.0', 'imagick' ),
'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 9,
Expand All @@ -102,7 +102,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( 'memcached-3.2.0', 'xdebug-3.4.0', 'imagick' ),
'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0', 'imagick' ),
'composer' => true,
),
'phpunit' => 9,
Expand All @@ -114,9 +114,9 @@
'8.3' => array(
'php' => array(
'base_name' => 'php:8.3-fpm',
'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-dev', 'libzip-dev', 'libmemcached-dev', 'unzip', 'libmagickwand-dev', 'ghostscript', 'libonig-dev', 'locales', 'sudo', 'rsync', 'libxslt-dev' ),
'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-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( 'xdebug-3.4.0' ),
'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0' ),
'composer' => true,
),
'phpunit' => 9,
Expand All @@ -128,9 +128,9 @@
'8.4' => array(
'php' => array(
'base_name' => 'php:8.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' ),
'apt' => array( 'libjpeg-dev', 'libpng-dev', 'libwebp-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( 'xdebug-3.4.0' ),
'pecl_extensions' => array( 'memcached-3.3.0', 'xdebug-3.4.0' ),
'composer' => true,
),
'phpunit' => 9,
Expand Down

0 comments on commit e23d5b0

Please sign in to comment.