summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.examples/README.md5
-rw-r--r--.examples/dockerfiles/full/apache/Dockerfile1
-rw-r--r--.examples/dockerfiles/full/fpm-alpine/Dockerfile1
-rw-r--r--.examples/dockerfiles/full/fpm/Dockerfile1
-rw-r--r--13.0/apache/Dockerfile2
-rw-r--r--13.0/fpm-alpine/Dockerfile2
-rw-r--r--13.0/fpm/Dockerfile2
-rw-r--r--14.0/apache/Dockerfile2
-rw-r--r--14.0/fpm-alpine/Dockerfile2
-rw-r--r--14.0/fpm/Dockerfile2
-rw-r--r--15.0/apache/Dockerfile2
-rw-r--r--15.0/fpm-alpine/Dockerfile2
-rw-r--r--15.0/fpm/Dockerfile2
-rw-r--r--README.md2
14 files changed, 17 insertions, 11 deletions
diff --git a/.examples/README.md b/.examples/README.md
index 015ff53e..476832a9 100644
--- a/.examples/README.md
+++ b/.examples/README.md
@@ -27,7 +27,7 @@ NOTE: Per default, only previews for BMP, GIF, JPEG, MarkDown, MP3, PNG, TXT, an
NOTE: Nextcloud recommends [disabling preview generation](https://docs.nextcloud.com/server/12/admin_manual/configuration_server/harden_server.html?highlight=enabledpreviewproviders#disable-preview-image-generation) for high security deployments, as preview generation opens your nextcloud instance to new possible attack vectors.
-The required steps for each optional/recommended package that is not already in the Nextcloud image are listed here, so that the Dockerfile can easily be modified to only install the needed extra packages. Simply remove the steps for the unwanted packages from the Dockerfile.
+The required steps for each optional/recommended package that is not already in the Nextcloud image are listed here, so that the Dockerfile can easily be modified to only install the needed extra packages. Simply remove the steps for the unwanted packages from the Dockerfile.
#### PHP Module bz2
`docker-php-ext-install bz2`
@@ -49,6 +49,9 @@ The required steps for each optional/recommended package that is not already in
#### ffmpeg
`apt install ffmpeg`
+#### imagemagick SVG support
+`apt install libmagickcore-6.q16-3-extra`
+
#### LibreOffice
`apt install libreoffice`
diff --git a/.examples/dockerfiles/full/apache/Dockerfile b/.examples/dockerfiles/full/apache/Dockerfile
index 4ddcea8e..9e600e76 100644
--- a/.examples/dockerfiles/full/apache/Dockerfile
+++ b/.examples/dockerfiles/full/apache/Dockerfile
@@ -5,6 +5,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
ffmpeg \
+ libmagickcore-6.q16-3-extra \
smbclient \
supervisor \
# libreoffice \
diff --git a/.examples/dockerfiles/full/fpm-alpine/Dockerfile b/.examples/dockerfiles/full/fpm-alpine/Dockerfile
index 716b32ff..37029c8e 100644
--- a/.examples/dockerfiles/full/fpm-alpine/Dockerfile
+++ b/.examples/dockerfiles/full/fpm-alpine/Dockerfile
@@ -4,6 +4,7 @@ RUN set -ex; \
\
apk add --no-cache \
ffmpeg \
+ imagemagick \
samba-client \
supervisor \
# libreoffice \
diff --git a/.examples/dockerfiles/full/fpm/Dockerfile b/.examples/dockerfiles/full/fpm/Dockerfile
index deab8d8b..5172e3f2 100644
--- a/.examples/dockerfiles/full/fpm/Dockerfile
+++ b/.examples/dockerfiles/full/fpm/Dockerfile
@@ -5,6 +5,7 @@ RUN set -ex; \
apt-get update; \
apt-get install -y --no-install-recommends \
ffmpeg \
+ libmagickcore-6.q16-3-extra \
smbclient \
supervisor \
# libreoffice \
diff --git a/13.0/apache/Dockerfile b/13.0/apache/Dockerfile
index d36104af..7cddbb0a 100644
--- a/13.0/apache/Dockerfile
+++ b/13.0/apache/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
fetchDeps=" \
diff --git a/13.0/fpm-alpine/Dockerfile b/13.0/fpm-alpine/Dockerfile
index 98bc406b..b546bf7f 100644
--- a/13.0/fpm-alpine/Dockerfile
+++ b/13.0/fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/13.0/fpm/Dockerfile b/13.0/fpm/Dockerfile
index 22f343d8..4200fcdb 100644
--- a/13.0/fpm/Dockerfile
+++ b/13.0/fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 13.0.10
+ENV NEXTCLOUD_VERSION 13.0.11
RUN set -ex; \
fetchDeps=" \
diff --git a/14.0/apache/Dockerfile b/14.0/apache/Dockerfile
index b0bf50c0..070f3989 100644
--- a/14.0/apache/Dockerfile
+++ b/14.0/apache/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
fetchDeps=" \
diff --git a/14.0/fpm-alpine/Dockerfile b/14.0/fpm-alpine/Dockerfile
index 95cae19e..b8a8a25b 100644
--- a/14.0/fpm-alpine/Dockerfile
+++ b/14.0/fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/14.0/fpm/Dockerfile b/14.0/fpm/Dockerfile
index 7e7cff2c..93a12239 100644
--- a/14.0/fpm/Dockerfile
+++ b/14.0/fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 14.0.6
+ENV NEXTCLOUD_VERSION 14.0.7
RUN set -ex; \
fetchDeps=" \
diff --git a/15.0/apache/Dockerfile b/15.0/apache/Dockerfile
index 09e87842..409b8035 100644
--- a/15.0/apache/Dockerfile
+++ b/15.0/apache/Dockerfile
@@ -110,7 +110,7 @@ RUN a2enmod rewrite remoteip ;\
} > /etc/apache2/conf-available/remoteip.conf;\
a2enconf remoteip
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/15.0/fpm-alpine/Dockerfile b/15.0/fpm-alpine/Dockerfile
index 1e5b23fa..10f4ff11 100644
--- a/15.0/fpm-alpine/Dockerfile
+++ b/15.0/fpm-alpine/Dockerfile
@@ -91,7 +91,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
apk add --no-cache --virtual .fetch-deps \
diff --git a/15.0/fpm/Dockerfile b/15.0/fpm/Dockerfile
index 0e6ffcd1..62544154 100644
--- a/15.0/fpm/Dockerfile
+++ b/15.0/fpm/Dockerfile
@@ -102,7 +102,7 @@ RUN { \
VOLUME /var/www/html
-ENV NEXTCLOUD_VERSION 15.0.2
+ENV NEXTCLOUD_VERSION 15.0.4
RUN set -ex; \
fetchDeps=" \
diff --git a/README.md b/README.md
index 23e2fa65..b6c0876c 100644
--- a/README.md
+++ b/README.md
@@ -71,7 +71,7 @@ Overview of the folders that can be mounted as volumes:
- `/var/www/html/custom_apps` installed / modified apps
- `/var/www/html/config` local configuration
- `/var/www/html/data` the actual data of your Nextcloud
-- `/var/www/html/themes/<YOU_CUSTOM_THEME>` theming/branding
+- `/var/www/html/themes/<YOUR_CUSTOM_THEME>` theming/branding
If you want to use named volumes for all of these it would look like this
```console