From a90b2f580e3fa77d44b66c147f8b990c92c6315d Mon Sep 17 00:00:00 2001 From: realies <5107843+realies@users.noreply.github.com> Date: Tue, 18 Feb 2025 19:23:58 +0000 Subject: [PATCH 1/2] feature: add ffmpeg Signed-off-by: realies <5107843+realies@users.noreply.github.com> --- 29/apache/Dockerfile | 1 + 29/fpm-alpine/Dockerfile | 1 + 29/fpm/Dockerfile | 1 + 30/apache/Dockerfile | 1 + 30/fpm-alpine/Dockerfile | 1 + 30/fpm/Dockerfile | 1 + Dockerfile-alpine.template | 1 + Dockerfile-debian.template | 1 + 8 files changed, 8 insertions(+) diff --git a/29/apache/Dockerfile b/29/apache/Dockerfile index 4aec7fe7..c2af266d 100644 --- a/29/apache/Dockerfile +++ b/29/apache/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/29/fpm-alpine/Dockerfile b/29/fpm-alpine/Dockerfile index 7eec3144..622626ea 100644 --- a/29/fpm-alpine/Dockerfile +++ b/29/fpm-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM php:8.2-fpm-alpine3.21 RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/29/fpm/Dockerfile b/29/fpm/Dockerfile index 819fd601..fe6ff578 100644 --- a/29/fpm/Dockerfile +++ b/29/fpm/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/30/apache/Dockerfile b/30/apache/Dockerfile index 3bb31915..538b19c8 100644 --- a/30/apache/Dockerfile +++ b/30/apache/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/30/fpm-alpine/Dockerfile b/30/fpm-alpine/Dockerfile index 7ad94ea2..578f11e5 100644 --- a/30/fpm-alpine/Dockerfile +++ b/30/fpm-alpine/Dockerfile @@ -5,6 +5,7 @@ FROM php:8.2-fpm-alpine3.21 RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/30/fpm/Dockerfile b/30/fpm/Dockerfile index c904d52e..81e514e9 100644 --- a/30/fpm/Dockerfile +++ b/30/fpm/Dockerfile @@ -6,6 +6,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template index cf6af0ff..688b4e85 100644 --- a/Dockerfile-alpine.template +++ b/Dockerfile-alpine.template @@ -4,6 +4,7 @@ FROM php:%%PHP_VERSION%%-%%VARIANT%%%%ALPINE_VERSION%% RUN set -ex; \ \ apk add --no-cache \ + ffmpeg \ imagemagick \ imagemagick-pdf \ imagemagick-jpeg \ diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template index cadae18a..ade20b7f 100644 --- a/Dockerfile-debian.template +++ b/Dockerfile-debian.template @@ -5,6 +5,7 @@ RUN set -ex; \ \ apt-get update; \ apt-get install -y --no-install-recommends \ + ffmpeg \ busybox-static \ bzip2 \ libldap-common \ From c351ce76ab819301d0c124aefe9475761582e3f3 Mon Sep 17 00:00:00 2001 From: Josh Date: Sun, 9 Mar 2025 10:31:16 -0400 Subject: [PATCH 2/2] docs(README): Fix missing `-it` in non-Compose `docker exec` command Signed-off-by: Josh --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9f13f17c..7de62124 100644 --- a/README.md +++ b/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