From: Thomas B <redacted>
Date: Mon, 18 Jan 2021 20:35:37 +0000 (+0100)
Subject: Add imagick module to enable TIFF image conversion (#124)
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=a8b213cef1f142be3cd75eb258bf88256e9c8791;p=roundcube-roundcubemail-docker.git

Add imagick module to enable TIFF image conversion (#124)

* Add imagick module to enable TIFF image conversion

fixes issue #123
---

diff --git a/apache/Dockerfile b/apache/Dockerfile
index 923432e..df2dab8 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -11,6 +11,7 @@ RUN set -ex; \
 		libicu-dev \
 		libjpeg62-turbo-dev \
 		libldap2-dev \
+		libmagickwand-dev \
 		libpng-dev \
 		libpq-dev \
 		libsqlite3-dev \
@@ -30,6 +31,8 @@ RUN set -ex; \
 		pdo_sqlite \
 		zip \
 	; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
@@ -60,7 +63,6 @@ ADD https://getcomposer.org/installer /tmp/composer-installer.php
 RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
 	rm /tmp/composer-installer.php
 
-# enable mod_rewrite
 RUN a2enmod rewrite
 
 # expose these volumes
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index 6550b89..e251a16 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -13,10 +13,13 @@ RUN set -ex; \
 RUN set -ex; \
 	\
 	apk add --no-cache --virtual .build-deps \
+		$PHPIZE_DEPS \
 		icu-dev \
+		imagemagick-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libzip-dev \
+		libtool \
 		openldap-dev \
 		postgresql-dev \
 		sqlite-dev \
@@ -34,6 +37,8 @@ RUN set -ex; \
 		pdo_sqlite \
 		zip \
 	; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
@@ -41,7 +46,7 @@ RUN set -ex; \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 		)"; \
-	apk add --virtual .roundcubemail-phpext-rundeps $runDeps; \
+	apk add --virtual .roundcubemail-phpext-rundeps imagemagick $runDeps; \
 	apk del .build-deps
 
 # add composer.phar
@@ -50,6 +55,7 @@ ADD https://getcomposer.org/installer /tmp/composer-installer.php
 RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
 	rm /tmp/composer-installer.php
 
+
 # expose these volumes
 VOLUME /var/roundcube/config
 VOLUME /var/roundcube/db
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index a01c1d2..a679643 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -11,6 +11,7 @@ RUN set -ex; \
 		libicu-dev \
 		libjpeg62-turbo-dev \
 		libldap2-dev \
+		libmagickwand-dev \
 		libpng-dev \
 		libpq-dev \
 		libsqlite3-dev \
@@ -30,6 +31,8 @@ RUN set -ex; \
 		pdo_sqlite \
 		zip \
 	; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \
@@ -60,6 +63,7 @@ ADD https://getcomposer.org/installer /tmp/composer-installer.php
 RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
 	rm /tmp/composer-installer.php
 
+
 # expose these volumes
 VOLUME /var/roundcube/config
 VOLUME /var/roundcube/db
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index 9883163..37a6648 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -13,10 +13,13 @@ RUN set -ex; \
 RUN set -ex; \
 	\
 	apk add --no-cache --virtual .build-deps \
+		$PHPIZE_DEPS \
 		icu-dev \
+		imagemagick-dev \
 		libjpeg-turbo-dev \
 		libpng-dev \
 		libzip-dev \
+		libtool \
 		openldap-dev \
 		postgresql-dev \
 		sqlite-dev \
@@ -34,6 +37,8 @@ RUN set -ex; \
 		pdo_sqlite \
 		zip \
 	; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 	runDeps="$( \
 		scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/lib/php/extensions \
@@ -41,7 +46,7 @@ RUN set -ex; \
 		| sort -u \
 		| awk 'system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } { print "so:" $1 }' \
 		)"; \
-	apk add --virtual .roundcubemail-phpext-rundeps $runDeps; \
+	apk add --virtual .roundcubemail-phpext-rundeps imagemagick $runDeps; \
 	apk del .build-deps
 
 # add composer.phar
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index b47fef0..89f0b7d 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -11,6 +11,7 @@ RUN set -ex; \
 		libicu-dev \
 		libjpeg62-turbo-dev \
 		libldap2-dev \
+		libmagickwand-dev \
 		libpng-dev \
 		libpq-dev \
 		libsqlite3-dev \
@@ -30,6 +31,8 @@ RUN set -ex; \
 		pdo_sqlite \
 		zip \
 	; \
+	pecl install imagick; \
+	docker-php-ext-enable imagick; \
 	\
 # reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies
 	apt-mark auto '.*' > /dev/null; \