summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTilo Spannagel <development@tilosp.de>2018-02-07 11:53:16 +0100
committerGitHub <noreply@github.com>2018-02-07 11:53:16 +0100
commit80a384c2b6bf3c642c730d4cc7929742ee896094 (patch)
treeef29f563bda005c1cee19053c0ee282894bdd8f9
parentf514394502250dc7a723a0530a0e2db57c17b6d9 (diff)
parent81f1412a1fc11dd6594d619b784f27c8dec7baf1 (diff)
Merge pull request #250 from nextcloud/add-freetype
Add freetype to gd
-rw-r--r--11.0/apache/Dockerfile2
-rw-r--r--11.0/fpm/Dockerfile2
-rw-r--r--12.0/apache/Dockerfile2
-rw-r--r--12.0/fpm/Dockerfile2
-rw-r--r--13.0/apache/Dockerfile2
-rw-r--r--13.0/fpm/Dockerfile2
-rw-r--r--Dockerfile.template2
7 files changed, 7 insertions, 7 deletions
diff --git a/11.0/apache/Dockerfile b/11.0/apache/Dockerfile
index 2c42d99f..cc33bcbb 100644
--- a/11.0/apache/Dockerfile
+++ b/11.0/apache/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/11.0/fpm/Dockerfile b/11.0/fpm/Dockerfile
index e10bb75d..c4845ce9 100644
--- a/11.0/fpm/Dockerfile
+++ b/11.0/fpm/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/12.0/apache/Dockerfile b/12.0/apache/Dockerfile
index 4a3e8673..77dc2e93 100644
--- a/12.0/apache/Dockerfile
+++ b/12.0/apache/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/12.0/fpm/Dockerfile b/12.0/fpm/Dockerfile
index 2b6dca09..69c31507 100644
--- a/12.0/fpm/Dockerfile
+++ b/12.0/fpm/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index 876c0c77..ad48f0ad 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 0845ae28..c2728ac4 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \
diff --git a/Dockerfile.template b/Dockerfile.template
index dc7b8cb3..eb65a15c 100644
--- a/Dockerfile.template
+++ b/Dockerfile.template
@@ -29,7 +29,7 @@ RUN set -ex; \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
- docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr; \
+ docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install gd exif intl mbstring mcrypt ldap mysqli opcache pdo_mysql pdo_pgsql pgsql zip pcntl; \
pecl install APCu-5.1.9; \