From d8d636736e712b4c298c109d657ae051eecc9c5e Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Tue, 30 Jun 2020 12:37:20 +0100 Subject: [PATCH 1/3] add GMP and MCrypt to builds --- php7.2/apache/Dockerfile | 5 +++++ php7.2/fpm-alpine/Dockerfile | 5 +++++ php7.2/fpm/Dockerfile | 5 +++++ php7.3/apache/Dockerfile | 5 +++++ php7.3/fpm-alpine/Dockerfile | 5 +++++ php7.3/fpm/Dockerfile | 5 +++++ php7.4/apache/Dockerfile | 5 +++++ php7.4/fpm-alpine/Dockerfile | 5 +++++ php7.4/fpm/Dockerfile | 5 +++++ 9 files changed, 45 insertions(+) diff --git a/php7.2/apache/Dockerfile b/php7.2/apache/Dockerfile index 408f73a..ef1416b 100644 --- a/php7.2/apache/Dockerfile +++ b/php7.2/apache/Dockerfile @@ -20,6 +20,8 @@ RUN set -ex; \ libmemcached-dev \ libpng-dev \ libpq-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -34,17 +36,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index 36666d4..9e5bf66 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/php7.2/fpm-alpine/Dockerfile @@ -21,6 +21,8 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -34,17 +36,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ runDeps="$( \ diff --git a/php7.2/fpm/Dockerfile b/php7.2/fpm/Dockerfile index 0d5ff90..d12e4a8 100644 --- a/php7.2/fpm/Dockerfile +++ b/php7.2/fpm/Dockerfile @@ -17,6 +17,8 @@ RUN set -ex; \ libmemcached-dev \ libpng-dev \ libpq-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -31,17 +33,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies diff --git a/php7.3/apache/Dockerfile b/php7.3/apache/Dockerfile index 1ac1d06..af37818 100644 --- a/php7.3/apache/Dockerfile +++ b/php7.3/apache/Dockerfile @@ -21,6 +21,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -35,17 +37,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index 804d5ee..b3c3de4 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -22,6 +22,8 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -35,17 +37,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ runDeps="$( \ diff --git a/php7.3/fpm/Dockerfile b/php7.3/fpm/Dockerfile index 870ddf3..237ae0a 100644 --- a/php7.3/fpm/Dockerfile +++ b/php7.3/fpm/Dockerfile @@ -18,6 +18,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg-dir=/usr --with-png-dir=/usr; \ @@ -32,17 +34,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies diff --git a/php7.4/apache/Dockerfile b/php7.4/apache/Dockerfile index d71a07b..f23af93 100644 --- a/php7.4/apache/Dockerfile +++ b/php7.4/apache/Dockerfile @@ -21,6 +21,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg; \ @@ -35,17 +37,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile index aebf922..b878cf5 100644 --- a/php7.4/fpm-alpine/Dockerfile +++ b/php7.4/fpm-alpine/Dockerfile @@ -22,6 +22,8 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg; \ @@ -35,17 +37,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ runDeps="$( \ diff --git a/php7.4/fpm/Dockerfile b/php7.4/fpm/Dockerfile index bf8449a..c43ef6c 100644 --- a/php7.4/fpm/Dockerfile +++ b/php7.4/fpm/Dockerfile @@ -18,6 +18,8 @@ RUN set -ex; \ libpng-dev \ libpq-dev \ libzip-dev \ + libgmp-dev \ + libmcrypt-dev \ ; \ \ docker-php-ext-configure gd --with-jpeg; \ @@ -32,17 +34,20 @@ RUN set -ex; \ pdo_pgsql \ pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately pecl install APCu-5.1.18; \ pecl install memcached-3.1.5; \ pecl install redis-4.3.0; \ + pecl install mcrypt-1.0.3; \ \ docker-php-ext-enable \ apcu \ memcached \ redis \ + mcrypt \ ; \ \ # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies From cd3ca692a6e068c3e3e1ba89d5ac2c936708b170 Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Tue, 30 Jun 2020 12:44:09 +0100 Subject: [PATCH 2/3] add GMP and Mcrypt versions to update.sh --- update.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/update.sh b/update.sh index acded9d..a58c783 100755 --- a/update.sh +++ b/update.sh @@ -32,6 +32,7 @@ declare -A pecl_versions=( [php7-APCu]='5.1.18' [php7-memcached]='3.1.5' [php7-redis]='4.3.0' + [php7-mcrypt]='1.0.3' ) travisEnv= @@ -62,6 +63,7 @@ for phpVersion in "${phpVersions[@]}"; do -e 's!%%APCU_VERSION%%!'"${pecl_versions[$phpMajorVersion-APCu]}"'!g' \ -e 's!%%MEMCACHED_VERSION%%!'"${pecl_versions[$phpMajorVersion-memcached]}"'!g' \ -e 's!%%REDIS_VERSION%%!'"${pecl_versions[$phpMajorVersion-redis]}"'!g' \ + -e 's!%%MCRYPT_VERSION%%!'"${pecl_versions[$phpMajorVersion-mcrypt]}"'!g' \ -e 's!%%CMD%%!'"$cmd"'!g' \ "Dockerfile-${base}.template" > "$dir/Dockerfile" From 34de150a590cbc7831a52843e80a132b7e02cdc5 Mon Sep 17 00:00:00 2001 From: "Phil E. Taylor" Date: Tue, 30 Jun 2020 20:01:23 +0100 Subject: [PATCH 3/3] Fix gmp in alpine --- php7.2/fpm-alpine/Dockerfile | 2 +- php7.3/fpm-alpine/Dockerfile | 2 +- php7.4/fpm-alpine/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/php7.2/fpm-alpine/Dockerfile b/php7.2/fpm-alpine/Dockerfile index 9e5bf66..da4d7bc 100644 --- a/php7.2/fpm-alpine/Dockerfile +++ b/php7.2/fpm-alpine/Dockerfile @@ -21,7 +21,7 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ - libgmp-dev \ + gmp-dev \ libmcrypt-dev \ ; \ \ diff --git a/php7.3/fpm-alpine/Dockerfile b/php7.3/fpm-alpine/Dockerfile index b3c3de4..c45cacb 100644 --- a/php7.3/fpm-alpine/Dockerfile +++ b/php7.3/fpm-alpine/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ - libgmp-dev \ + gmp-dev \ libmcrypt-dev \ ; \ \ diff --git a/php7.4/fpm-alpine/Dockerfile b/php7.4/fpm-alpine/Dockerfile index b878cf5..45de9f6 100644 --- a/php7.4/fpm-alpine/Dockerfile +++ b/php7.4/fpm-alpine/Dockerfile @@ -22,7 +22,7 @@ RUN set -ex; \ openldap-dev \ pcre-dev \ postgresql-dev \ - libgmp-dev \ + gmp-dev \ libmcrypt-dev \ ; \ \