summaryrefslogtreecommitdiffstats
path: root/.examples
diff options
context:
space:
mode:
authorRobert Dailey <rcdailey@gmail.com>2018-12-10 18:06:21 -0600
committerRobert Dailey <rcdailey@gmail.com>2018-12-12 13:44:27 -0600
commit2f90715d31ddfc0983ab6b55918ee8078e506f0b (patch)
tree4b10faa5ca06a0137e26ce477ff1f5788774f71a /.examples
parent783232840a16a3f9100da526edf8ca597800ac2a (diff)
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>
Diffstat (limited to '.examples')
-rw-r--r--.examples/README.md5
-rw-r--r--.examples/dockerfiles/full/apache/Dockerfile6
-rw-r--r--.examples/dockerfiles/full/fpm/Dockerfile6
3 files changed, 6 insertions, 11 deletions
diff --git a/.examples/README.md b/.examples/README.md
index d2183447..f2842d92 100644
--- a/.examples/README.md
+++ b/.examples/README.md
@@ -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`
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index fc5e848c..178ca844 100644
--- a/.examples/dockerfiles/full/apache/Dockerfile
+++ b/.examples/dockerfiles/full/apache/Dockerfile
@@ -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
diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile
index b7311258..b0c61d64 100644
--- a/.examples/dockerfiles/full/fpm/Dockerfile
+++ b/.examples/dockerfiles/full/fpm/Dockerfile
@@ -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