aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2024-12-26 11:06:14 +01:00
Code Activity

Enable WEBP support in PHP's gd in debian and alpine containers (#785)

Browse source 
Signed-off-by: Flow86 <656249+Flow86@users.noreply.github.com>
This commit is contained in:
Flow86 2019-06-27 14:01:35 +02:00 committed by J0WI
parent 3f40b69c54
commit f5665e1482
11 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
14.0/apache/Dockerfile
View file

@ -35,10 +35,11 @@ RUN set -ex; \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
14.0/fpm-alpine/Dockerfile
View file

@ -30,9 +30,10 @@ RUN set -ex; \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \ imagemagick-dev \
libwebp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
14.0/fpm/Dockerfile
View file

@ -35,10 +35,11 @@ RUN set -ex; \
libpq-dev \ libpq-dev \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
15.0/apache/Dockerfile
View file

@ -36,10 +36,11 @@ RUN set -ex; \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libzip-dev \ libzip-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
15.0/fpm-alpine/Dockerfile
View file

@ -31,9 +31,10 @@ RUN set -ex; \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \ imagemagick-dev \
libwebp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
15.0/fpm/Dockerfile
View file

@ -36,10 +36,11 @@ RUN set -ex; \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libzip-dev \ libzip-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
16.0/apache/Dockerfile
View file

@ -36,10 +36,11 @@ RUN set -ex; \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libzip-dev \ libzip-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
16.0/fpm-alpine/Dockerfile
View file

@ -31,9 +31,10 @@ RUN set -ex; \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \ imagemagick-dev \
libwebp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
16.0/fpm/Dockerfile
View file

@ -36,10 +36,11 @@ RUN set -ex; \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libzip-dev \ libzip-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
Dockerfile-alpine.template
View file

@ -30,9 +30,10 @@ RUN set -ex; \
pcre-dev \ pcre-dev \
postgresql-dev \ postgresql-dev \
imagemagick-dev \ imagemagick-dev \
libwebp-dev \
; \ ; \
\ \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap; \ docker-php-ext-configure ldap; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \

3
Dockerfile-debian.template
View file

@ -35,10 +35,11 @@ RUN set -ex; \
libxml2-dev \ libxml2-dev \
libmagickwand-dev \ libmagickwand-dev \
libzip-dev \ libzip-dev \
libwebp-dev \
; \ ; \
\ \
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \ debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
docker-php-ext-configure gd --with-freetype-dir=/usr --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 --with-webp-dir=/usr; \
docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \ docker-php-ext-configure ldap --with-libdir="lib/$debMultiarch"; \
docker-php-ext-install \ docker-php-ext-install \
exif \ exif \