From ba7e05837c83b740b8301b2e24a4990b07e124ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=8B=E3=81=B2=E3=82=8F=E3=81=974=EF=BC=88=E3=83=90?=
 =?UTF-8?q?=E3=83=BC=E3=82=B8=E3=83=A7=E3=83=B31=EF=BC=89?=
 <khws4v1@gmail.com>
Date: Tue, 5 Feb 2019 19:32:53 +0900
Subject: [PATCH] Add ffmpeg package for the runner container (#4145)

* Revert "Update Dockerfile (#4090)"

This reverts commit 6758b0f133bc89e4d6ad660172d48e026f4e047d.

* Docker: Add ffmpeg package for the runner container

Misskey 10.81.0 added thumbnail generation support.
However it did not work with Docker bacause ffmpeg has not been
installed in the runner container.
---
 Dockerfile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c4632d35..7e15967b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,6 @@ RUN unlink /usr/bin/free
 RUN apk add --no-cache \
     autoconf \
     automake \
-    ffmpeg \
     file \
     g++ \
     gcc \
@@ -36,7 +35,9 @@ RUN node-gyp configure \
 
 FROM base AS runner
 
-RUN apk add --no-cache tini
+RUN apk add --no-cache \
+    ffmpeg \
+    tini
 ENTRYPOINT ["/sbin/tini", "--"]
 
 COPY --from=builder /misskey/node_modules ./node_modules