From 7eb00b62aab4e123eec0b0a2d213396fb87c97c8 Mon Sep 17 00:00:00 2001 From: Marcel Klehr Date: Sat, 14 Sep 2019 13:11:43 +0200 Subject: [PATCH] Add gmp php extension Signed-off-by: Marcel Klehr --- .examples/dockerfiles/full/apache/Dockerfile | 3 --- .examples/dockerfiles/full/fpm-alpine/Dockerfile | 2 -- .examples/dockerfiles/full/fpm/Dockerfile | 3 --- 15.0/apache/Dockerfile | 6 +++++- 15.0/fpm-alpine/Dockerfile | 4 +++- 15.0/fpm/Dockerfile | 6 +++++- 16.0/apache/Dockerfile | 6 +++++- 16.0/fpm-alpine/Dockerfile | 4 +++- 16.0/fpm/Dockerfile | 6 +++++- 17.0/apache/Dockerfile | 6 +++++- 17.0/fpm-alpine/Dockerfile | 4 +++- 17.0/fpm/Dockerfile | 6 +++++- Dockerfile-alpine.template | 2 ++ Dockerfile-debian.template | 4 ++++ 14 files changed, 45 insertions(+), 17 deletions(-) diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile index 9e600e7..bd75916 100644 --- a/.examples/dockerfiles/full/apache/Dockerfile +++ b/.examples/dockerfiles/full/apache/Dockerfile @@ -20,16 +20,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libc-client-dev \ - libgmp3-dev \ libkrb5-dev \ libsmbclient-dev \ ; \ \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ - ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h; \ docker-php-ext-install \ bz2 \ - gmp \ imap \ ; \ pecl install smbclient; \ diff --git a/.examples/dockerfiles/full/fpm-alpine/Dockerfile b/.examples/dockerfiles/full/fpm-alpine/Dockerfile index 37029c8..bbc8b98 100644 --- a/.examples/dockerfiles/full/fpm-alpine/Dockerfile +++ b/.examples/dockerfiles/full/fpm-alpine/Dockerfile @@ -19,13 +19,11 @@ RUN set -ex; \ libressl-dev \ samba-dev \ bzip2-dev \ - gmp-dev \ ; \ \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ docker-php-ext-install \ bz2 \ - gmp \ imap \ ; \ pecl install smbclient; \ diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile index 5172e3f..0fa2ccb 100644 --- a/.examples/dockerfiles/full/fpm/Dockerfile +++ b/.examples/dockerfiles/full/fpm/Dockerfile @@ -20,16 +20,13 @@ RUN set -ex; \ apt-get install -y --no-install-recommends \ libbz2-dev \ libc-client-dev \ - libgmp3-dev \ libkrb5-dev \ libsmbclient-dev \ ; \ \ docker-php-ext-configure imap --with-kerberos --with-imap-ssl; \ - ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h; \ docker-php-ext-install \ bz2 \ - gmp \ imap \ ; \ pecl install smbclient; \ diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile index 5862d6c..8fc7352 100644 --- a/15.0/apache/Dockerfile +++ b/15.0/apache/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile index 5d9f6b5..ac482d6 100644 --- a/15.0/fpm-alpine/Dockerfile +++ b/15.0/fpm-alpine/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ postgresql-dev \ imagemagick-dev \ libwebp-dev \ + gmp-dev \ ; \ \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ @@ -46,11 +47,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile index 38db82c..bf6ee15 100644 --- a/15.0/fpm/Dockerfile +++ b/15.0/fpm/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/16.0/apache/Dockerfile b/16.0/apache/Dockerfile index 2e0f4ba..f831e5a 100644 --- a/16.0/apache/Dockerfile +++ b/16.0/apache/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/16.0/fpm-alpine/Dockerfile b/16.0/fpm-alpine/Dockerfile index 1dd03fa..45aee70 100644 --- a/16.0/fpm-alpine/Dockerfile +++ b/16.0/fpm-alpine/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ postgresql-dev \ imagemagick-dev \ libwebp-dev \ + gmp-dev \ ; \ \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ @@ -46,11 +47,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/16.0/fpm/Dockerfile b/16.0/fpm/Dockerfile index 4b4f0d9..e3c5117 100644 --- a/16.0/fpm/Dockerfile +++ b/16.0/fpm/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/17.0/apache/Dockerfile b/17.0/apache/Dockerfile index 462b636..8ebc157 100644 --- a/17.0/apache/Dockerfile +++ b/17.0/apache/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/17.0/fpm-alpine/Dockerfile b/17.0/fpm-alpine/Dockerfile index 6123e1b..21128c2 100644 --- a/17.0/fpm-alpine/Dockerfile +++ b/17.0/fpm-alpine/Dockerfile @@ -32,6 +32,7 @@ RUN set -ex; \ postgresql-dev \ imagemagick-dev \ libwebp-dev \ + gmp-dev \ ; \ \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ @@ -46,11 +47,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/17.0/fpm/Dockerfile b/17.0/fpm/Dockerfile index 58458ed..0000862 100644 --- a/17.0/fpm/Dockerfile +++ b/17.0/fpm/Dockerfile @@ -37,10 +37,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -52,11 +55,12 @@ RUN set -ex; \ pdo_mysql \ pdo_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.17; \ - pecl install memcached-3.1.3; \ + pecl install memcached-3.1.4; \ pecl install redis-4.3.0; \ pecl install imagick-3.4.4; \ \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index 065e5fe..ab55a1f 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -31,6 +31,7 @@ RUN set -ex; \ postgresql-dev \ imagemagick-dev \ libwebp-dev \ + gmp-dev \ ; \ \ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ @@ -45,6 +46,7 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index 642c4fd..9345d2e 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -36,10 +36,13 @@ RUN set -ex; \ libmagickwand-dev \ libzip-dev \ libwebp-dev \ + libgmp-dev \ ; \ \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ + if [ ! -e /usr/include/gmp.h ]; then ln -s /usr/include/$debMultiarch/gmp.h /usr/include/gmp.h; fi;\ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr --with-webp-dir=/usr; \ + docker-php-ext-configure gmp --with-gmp="/usr/include/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-install -j "$(nproc)" \ exif \ @@ -51,6 +54,7 @@ RUN set -ex; \ pdo_mysql \ pdo_pgsql \ zip \ + gmp \ ; \ \ # pecl will claim success even if one install fails, so we need to perform each install separately