graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-08 23:23:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add ffmpeg package for the runner container (#4145)

Browse source 
* Revert "Update Dockerfile (#4090)"

This reverts commit 6758b0f133.

* 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.
This commit is contained in:
かひわし4（バージョン1） 2019-02-05 19:32:53 +09:00 committed by syuilo
parent 9dd06a7621
commit ba7e05837c
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Dockerfile
View file

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