about summary refs log tree commit diff
path: root/Dockerfile
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-12 18:22:43 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-12 18:22:43 +0200
commitce29624c6df83699a01808d68c19a2492864ffe8 (patch)
tree822f151d24ab6c04f20b0926f6290621c476e032 /Dockerfile
parent3d566279cb84aba6d07eaadebda6c059f2a58657 (diff)
Fixing image upload limits, allowing webm, merge/unmerge events trigger
timeline reload in UI, other small fixes
Diffstat (limited to 'Dockerfile')
-rw-r--r--Dockerfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 3acef6e13..ab6a9374f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ FROM ruby:2.2.4
 
 ENV RAILS_ENV=production
 
-RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs nodejs-legacy npm && rm -rf /var/lib/apt/lists/*
+RUN apt-get update -qq && apt-get install -y build-essential libpq-dev libxml2-dev libxslt1-dev nodejs nodejs-legacy npm ffmpeg && rm -rf /var/lib/apt/lists/*
 RUN mkdir /mastodon
 
 WORKDIR /mastodon