From be390c986447fca2ec5576c56177391add5516db Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Thu, 25 Mar 2021 19:22:10 -0600
Subject: [PATCH] Add ffmpeg and imagemagick to docker image
---
CHANGELOG.md | 4 ++++
Dockerfile | 4 +++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f159987..b20657e6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased]
+### Added
+
+* Added ffmpeg and ImageMagick to Docker image to support specialized thumbnail types.
+
### Fixed
* Handle guest accounts properly. Previously they were still declined, though by coincidence.
diff --git a/Dockerfile b/Dockerfile
index 3cad9bb6..624892e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,7 +21,9 @@ COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /opt/bin/gdpr_ex
RUN apk add --no-cache \
su-exec \
ca-certificates \
- dos2unix
+ dos2unix \
+ imagemagick \
+ ffmpeg
COPY ./config.sample.yaml /etc/media-repo.yaml.sample
COPY ./docker/run.sh /usr/local/bin/
--
GitLab