Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
matrix-media-repo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
matrix-media-repo
Commits
be390c98
Commit
be390c98
authored
3 years ago
by
Travis Ralston
Browse files
Options
Downloads
Patches
Plain Diff
Add ffmpeg and imagemagick to docker image
parent
b5181187
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+4
-0
4 additions, 0 deletions
CHANGELOG.md
Dockerfile
+3
-1
3 additions, 1 deletion
Dockerfile
with
7 additions
and
1 deletion
CHANGELOG.md
+
4
−
0
View file @
be390c98
...
@@ -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.
...
...
This diff is collapsed.
Click to expand it.
Dockerfile
+
3
−
1
View file @
be390c98
...
@@ -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/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment