Merge a90b2f580e into c351ce76ab

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

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 \

README.md

@@ -157,7 +157,7 @@ See:
 
 To use the [Nextcloud command-line interface](https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/occ_command.html) (aka. `occ` command):
 ```console
-$ docker exec --user www-data CONTAINER_ID php occ
+$ docker exec -it --user www-data CONTAINER_ID php occ
 ```
 or for docker compose:
 ```console