aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-04-19 18:36:09 +02:00
Code Activity

Fixed problem with GD and jpeg image processing

Browse source
This commit is contained in:
Blagovest Petrov 2017-01-23 21:15:29 +02:00
parent 5998fbe4cc
commit 08c5bbde9f
2 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
10.0/alpine-fpm/Dockerfile
View file

@ -19,9 +19,16 @@ RUN set -ex \
&& apk update \ && apk update \
&& apk add build-base python-dev py-pip jpeg-dev jpeg \ && apk add build-base python-dev py-pip jpeg-dev jpeg \
libldap openldap-dev zlib zlib-dev \ libldap openldap-dev zlib zlib-dev \
freetype freetype-dev libjpeg-turbo libjpeg-turbo-dev \
postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \ postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \
autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \ autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \
&& docker-php-ext-install gd exif intl mbstring mcrypt opcache \ && docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include \
--with-jpeg-dir=/usr/include \
&& NPROC=$(getconf _NPROCESSORS_ONLN) \
&& docker-php-ext-install -j${NPROC} gd \
&& docker-php-ext-install exif intl mbstring mcrypt opcache \
pdo_mysql pdo_pgsql pgsql zip ldap \ pdo_mysql pdo_pgsql pgsql zip ldap \
&& docker-php-ext-enable gd exif intl mbstring mcrypt opcache \ && docker-php-ext-enable gd exif intl mbstring mcrypt opcache \
pdo_mysql pdo_pgsql pgsql zip ldap \ pdo_mysql pdo_pgsql pgsql zip ldap \
@ -37,6 +44,7 @@ RUN set -ex \
&& docker-php-ext-enable redis apcu \ && docker-php-ext-enable redis apcu \
&& apk del autoconf make g++ gcc git py-pip zlib-dev \ && apk del autoconf make g++ gcc git py-pip zlib-dev \
jpeg-dev libmcrypt-dev libpng-dev openldap-dev \ jpeg-dev libmcrypt-dev libpng-dev openldap-dev \
freetype-dev libjpeg-turbo-dev \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*
VOLUME /var/www/html VOLUME /var/www/html

10
11.0/alpine-fpm/Dockerfile
View file

@ -19,9 +19,16 @@ RUN set -ex \
&& apk update \ && apk update \
&& apk add build-base python-dev py-pip jpeg-dev jpeg \ && apk add build-base python-dev py-pip jpeg-dev jpeg \
libldap openldap-dev zlib zlib-dev \ libldap openldap-dev zlib zlib-dev \
freetype freetype-dev libjpeg-turbo libjpeg-turbo-dev \
postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \ postgresql-dev libmcrypt-dev libmcrypt libpng-dev libpng \
autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \ autoconf make g++ gcc git file gnupg re2c icu icu-dev tzdata \
&& docker-php-ext-install gd exif intl mbstring mcrypt opcache \ && docker-php-ext-configure gd \
--with-freetype-dir=/usr/include/ \
--with-png-dir=/usr/include \
--with-jpeg-dir=/usr/include \
&& NPROC=$(getconf _NPROCESSORS_ONLN) \
&& docker-php-ext-install -j${NPROC} gd \
&& docker-php-ext-install exif intl mbstring mcrypt opcache \
pdo_mysql pdo_pgsql pgsql zip ldap \ pdo_mysql pdo_pgsql pgsql zip ldap \
&& docker-php-ext-enable gd exif intl mbstring mcrypt opcache \ && docker-php-ext-enable gd exif intl mbstring mcrypt opcache \
pdo_mysql pdo_pgsql pgsql zip ldap \ pdo_mysql pdo_pgsql pgsql zip ldap \
@ -37,6 +44,7 @@ RUN set -ex \
&& docker-php-ext-enable redis apcu \ && docker-php-ext-enable redis apcu \
&& apk del autoconf make g++ gcc git py-pip zlib-dev \ && apk del autoconf make g++ gcc git py-pip zlib-dev \
jpeg-dev libmcrypt-dev libpng-dev openldap-dev \ jpeg-dev libmcrypt-dev libpng-dev openldap-dev \
freetype-dev libjpeg-turbo-dev \
&& rm -rf /var/cache/apk/* && rm -rf /var/cache/apk/*
VOLUME /var/www/html VOLUME /var/www/html