Merge a90b2f580e into 73949fe23a

Fix bug introduced by #2400

Signed-off-by: Josh <josh.t.richards@gmail.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -14,9 +14,9 @@ contact_links:
     - name: 🐳 Docker Forum
       url: https://forums.docker.com/
       about: Ask a question, get assistance or start a discussion regarding Docker
-    - name: 🐛 Bug Report: Nextcloud Server
+    - name: 🐛 Bug Report - Nextcloud Server
       url: https://github.com/nextcloud/server/issues/new/choose
       about: Report a bug in Nextcloud Server
-    - name: Enhancement Idea: Nextcloud Server
+    - name: Enhancement Idea - Nextcloud Server
       url: https://github.com/nextcloud/server/issues/new/choose
       about: Suggest an enhancement idea for Nextcloud Server

29/apache/Dockerfile

@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \

29/fpm-alpine/Dockerfile

@@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \

29/fpm/Dockerfile

@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \

30/apache/Dockerfile

@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \

30/fpm-alpine/Dockerfile

@@ -8,6 +8,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \

30/fpm/Dockerfile

@@ -9,6 +9,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \

Dockerfile-alpine.template

@@ -7,6 +7,7 @@ ENV IMAGICK_COMMIT_HASH d7d3c24af1b4f599897408f1714600b69a56473b
 RUN set -ex; \
     \
     apk add --no-cache \
+        ffmpeg \
         imagemagick \
         imagemagick-pdf \
         imagemagick-jpeg \

Dockerfile-debian.template

@@ -8,6 +8,7 @@ RUN set -ex; \
     \
     apt-get update; \
     apt-get install -y --no-install-recommends \
+        ffmpeg \
         busybox-static \
         bzip2 \
         libldap-common \