From: Thomas Bruederli <redacted>
Date: Mon, 1 Nov 2021 21:03:51 +0000 (+0100)
Subject: configure gd extension with freetype + jpeg (#137)
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=08fa0418127bf49fe4e6c4eb949f6b10ec08c6f2;p=roundcube-roundcubemail-docker.git

configure gd extension with freetype + jpeg (#137)
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 52556c5..ee0df0d 100644
--- 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 a8af5b2..3bee668 100644
--- 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 260dd0e..53936f3 100644
--- 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 aad9196..391f1b9 100644
--- 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 7ac43e5..367e8bc 100644
--- 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 \