configure gd extension with freetype + jpeg (#137)

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 52556c537ff68f688e0543bc55bd72e656dbfb2a..ee0df0d078be7ae69bdefbf3cbc89a11ffd5e384 100644 (file)
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -21,7 +21,7 @@ RUN set -ex; \
        ; \
        \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-       docker-php-ext-configure gd; \
+       docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
        docker-php-ext-install \
                exif \

diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index a8af5b22ad104b6ea2076720ae7e9223e62472a3..3bee668213a1e4863fdf8cdcbb21deadcd532729 100644 (file)
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -17,6 +17,7 @@ RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
                $PHPIZE_DEPS \
                icu-dev \
+               freetype-dev \
                imagemagick-dev \
                libjpeg-turbo-dev \
                libpng-dev \
@@ -28,7 +29,7 @@ RUN set -ex; \
                aspell-dev \
        ; \
        \
-       docker-php-ext-configure gd; \
+       docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap; \
        docker-php-ext-install \
                exif \

diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index 260dd0e2a6cd7fe7b0a1b88af02564606b44052f..53936f36818daa3e5af80d823c005197c50f283c 100644 (file)
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -21,7 +21,7 @@ RUN set -ex; \
        ; \
        \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-       docker-php-ext-configure gd; \
+       docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
        docker-php-ext-install \
                exif \

diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index aad91962476cd432692912554207ee2f6469a20d..391f1b99193e01aa036e80983619522a77edf20a 100644 (file)
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -17,6 +17,7 @@ RUN set -ex; \
        apk add --no-cache --virtual .build-deps \
                $PHPIZE_DEPS \
                icu-dev \
+               freetype-dev \
                imagemagick-dev \
                libjpeg-turbo-dev \
                libpng-dev \
@@ -28,7 +29,7 @@ RUN set -ex; \
                aspell-dev \
        ; \
        \
-       docker-php-ext-configure gd; \
+       docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap; \
        docker-php-ext-install \
                exif \

diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 7ac43e54c8e0c8aa76fdd3b02bed5a51325bb312..367e8bce9b2ed7542cba7bb2a4ab2826964009b1 100644 (file)
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -21,7 +21,7 @@ RUN set -ex; \
        ; \
        \
        debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
-       docker-php-ext-configure gd; \
+       docker-php-ext-configure gd --with-jpeg --with-freetype; \
        docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
        docker-php-ext-install \
                exif \