diff options
| author | かひわし4（バージョン1） <khws4v1@gmail.com> | 2019-02-05 19:32:53 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2019-02-05 19:32:53 +0900 |
| commit | ba7e05837c83b740b8301b2e24a4990b07e124ff (patch) | |
| tree | fe824580cd57484d4e6997e1ab2abad0fcfd1bc5 /Dockerfile | |
| parent | /.well-known 周りをいい感じに (#4141) (diff) | |
| download | sharkey-ba7e05837c83b740b8301b2e24a4990b07e124ff.tar.gz sharkey-ba7e05837c83b740b8301b2e24a4990b07e124ff.tar.bz2 sharkey-ba7e05837c83b740b8301b2e24a4990b07e124ff.zip | |
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.
Diffstat (limited to 'Dockerfile')
| -rw-r--r-- | Dockerfile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Dockerfile b/Dockerfile index 6c4632d35d..7e15967b05 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 |