summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.examples/dockerfiles/full/apache/Dockerfile3
-rw-r--r--.examples/dockerfiles/full/fpm-alpine/Dockerfile2
-rw-r--r--.examples/dockerfiles/full/fpm/Dockerfile3
-rw-r--r--15.0/apache/Dockerfile6
-rw-r--r--15.0/fpm-alpine/Dockerfile4
-rw-r--r--15.0/fpm/Dockerfile6
-rw-r--r--16.0/apache/Dockerfile6
-rw-r--r--16.0/fpm-alpine/Dockerfile4
-rw-r--r--16.0/fpm/Dockerfile6
-rw-r--r--17.0/apache/Dockerfile6
-rw-r--r--17.0/fpm-alpine/Dockerfile4
-rw-r--r--17.0/fpm/Dockerfile6
-rw-r--r--Dockerfile-alpine.template2
-rw-r--r--Dockerfile-debian.template4
14 files changed, 45 insertions, 17 deletions
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index 9e600e76..bd759168 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 37029c8e..bbc8b98e 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 5172e3f2..0fa2ccbf 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 5862d6cd..8fc73525 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 5d9f6b53..ac482d65 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 38db82ca..bf6ee156 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 2e0f4baa..f831e5a4 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 1dd03fa4..45aee706 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 4b4f0d97..e3c5117f 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 462b636b..8ebc1575 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 6123e1bf..21128c27 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 58458ed8..0000862e 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 065e5fe9..ab55a1fe 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 642c4fdc..9345d2ef 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