Skip to content
Snippets Groups Projects
Commit be390c98 authored by Travis Ralston's avatar Travis Ralston
Browse files

Add ffmpeg and imagemagick to docker image

parent b5181187
No related branches found
No related tags found
No related merge requests found
...@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), ...@@ -7,6 +7,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
## [Unreleased] ## [Unreleased]
### Added
* Added ffmpeg and ImageMagick to Docker image to support specialized thumbnail types.
### Fixed ### Fixed
* Handle guest accounts properly. Previously they were still declined, though by coincidence. * Handle guest accounts properly. Previously they were still declined, though by coincidence.
......
...@@ -21,7 +21,9 @@ COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /opt/bin/gdpr_ex ...@@ -21,7 +21,9 @@ COPY --from=builder /opt/bin/media_repo /opt/bin/import_synapse /opt/bin/gdpr_ex
RUN apk add --no-cache \ RUN apk add --no-cache \
su-exec \ su-exec \
ca-certificates \ ca-certificates \
dos2unix dos2unix \
imagemagick \
ffmpeg
COPY ./config.sample.yaml /etc/media-repo.yaml.sample COPY ./config.sample.yaml /etc/media-repo.yaml.sample
COPY ./docker/run.sh /usr/local/bin/ COPY ./docker/run.sh /usr/local/bin/
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment