adphi
/
Nextcloud-Docker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add imagick php extension 

There is a warning issued in Nextcloud 15 about 'imagick' php extension not
being present. They highly recommend that it be installed.

Fixes #574, fixes #263

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
This commit is contained in:
Robert Dailey 2018-12-10 18:06:21 -06:00
parent 783232840a
commit 2f90715d31
No known key found for this signature in database
GPG Key ID: 97751323F0627314
15 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.examples/README.md
View File

@ -32,11 +32,6 @@ The required steps for each optional/recommended package that is not already in
#### PHP Module bz2
`docker-php-ext-install bz2`
#### PHP Module imagick
`apt install libmagickwand-dev`
`pecl install imagick`
`docker-php-ext-enable imagick`
#### PHP Module imap
`apt install libc-client-dev libkrb5-dev`
`docker-php-ext-configure imap --with-kerberos --with-imap-ssl`

6
.examples/dockerfiles/full/apache/Dockerfile
View File

@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
&& apt-get update && apt-get install -y \
supervisor \
ffmpeg \
libmagickwand-dev \
libbz2-dev \
libgmp3-dev \
libc-client-dev \
libkrb5-dev \
@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
&& docker-php-ext-install bz2 gmp imap \
&& pecl install imagick smbclient \
&& docker-php-ext-enable imagick smbclient \
&& pecl install smbclient \
&& docker-php-ext-enable smbclient \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf

6
.examples/dockerfiles/full/fpm/Dockerfile
View File

@ -4,7 +4,7 @@ RUN mkdir -p /usr/share/man/man1 \
&& apt-get update && apt-get install -y \
supervisor \
ffmpeg \
libmagickwand-dev \
libbz2-dev \
libgmp3-dev \
libc-client-dev \
libkrb5-dev \
@ -15,8 +15,8 @@ RUN mkdir -p /usr/share/man/man1 \
&& docker-php-ext-configure imap --with-kerberos --with-imap-ssl \
&& ln -s "/usr/include/$(dpkg-architecture --query DEB_BUILD_MULTIARCH)/gmp.h" /usr/include/gmp.h \
&& docker-php-ext-install bz2 gmp imap \
&& pecl install imagick smbclient \
&& docker-php-ext-enable imagick smbclient \
&& pecl install smbclient \
&& docker-php-ext-enable smbclient \
&& mkdir /var/log/supervisord /var/run/supervisord
COPY supervisord.conf /etc/supervisor/supervisord.conf

3
13.0/apache/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
13.0/fpm-alpine/Dockerfile
View File

@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \
pcre-dev \
postgresql-dev \
imagemagick-dev \
; \
\
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -48,11 +49,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
runDeps="$( \

3
13.0/fpm/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
14.0/apache/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
14.0/fpm-alpine/Dockerfile
View File

@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \
pcre-dev \
postgresql-dev \
imagemagick-dev \
; \
\
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -48,11 +49,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
runDeps="$( \

3
14.0/fpm/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
15.0/apache/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
15.0/fpm-alpine/Dockerfile
View File

@ -28,6 +28,7 @@ RUN set -ex; \
openldap-dev \
pcre-dev \
postgresql-dev \
imagemagick-dev \
; \
\
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -48,11 +49,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
runDeps="$( \

3
15.0/fpm/Dockerfile
View File

@ -33,6 +33,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -54,11 +55,13 @@ RUN set -ex; \
pecl install APCu-5.1.15; \
pecl install memcached-3.0.4; \
pecl install redis-4.2.0; \
pecl install imagick-3.4.3; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

3
Dockerfile-alpine.template
View File

@ -27,6 +27,7 @@ RUN set -ex; \
openldap-dev \
pcre-dev \
postgresql-dev \
imagemagick-dev \
; \
\
docker-php-ext-configure gd --with-freetype-dir=/usr --with-png-dir=/usr --with-jpeg-dir=/usr; \
@ -47,11 +48,13 @@ RUN set -ex; \
pecl install APCu-%%APCU_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
runDeps="$( \

3
Dockerfile-debian.template
View File

@ -32,6 +32,7 @@ RUN set -ex; \
libpng-dev \
libpq-dev \
libxml2-dev \
libmagickwand-dev \
; \
\
debMultiarch="$(dpkg-architecture --query DEB_BUILD_MULTIARCH)"; \
@ -53,11 +54,13 @@ RUN set -ex; \
pecl install APCu-%%APCU_VERSION%%; \
pecl install memcached-%%MEMCACHED_VERSION%%; \
pecl install redis-%%REDIS_VERSION%%; \
pecl install imagick-%%IMAGICK_VERSION%%; \
\
docker-php-ext-enable \
apcu \
memcached \
redis \
imagick \
; \
\
# reset apt-mark's "manual" list so that "purge --auto-remove" will remove all build dependencies

2
update.sh
View File

@ -28,6 +28,7 @@ declare -A pecl_versions=(
[APCu]='5.1.15'
[memcached]='3.0.4'
[redis]='4.2.0'
[imagick]='3.4.3'
)
variants=(
@ -78,6 +79,7 @@ function create_variant() {
s/%%APCU_VERSION%%/'"${pecl_versions[APCu]}"'/g;
s/%%MEMCACHED_VERSION%%/'"${pecl_versions[memcached]}"'/g;
s/%%REDIS_VERSION%%/'"${pecl_versions[redis]}"'/g;
s/%%IMAGICK_VERSION%%/'"${pecl_versions[imagick]}"'/g;
' "$dir/Dockerfile"
# Copy the shell scripts