mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-05 21:37:10 -04:00
Merge pull request #728 from nvllsvm/ffmpeg_docker
Use ffmpeg from jrottenberg/ffmpeg
This commit is contained in:
commit
8ab08dd041
14
Dockerfile
14
Dockerfile
@ -1,15 +1,5 @@
|
|||||||
ARG DOTNET_VERSION=2
|
ARG DOTNET_VERSION=2
|
||||||
|
|
||||||
|
|
||||||
# Download ffmpeg first to allow quicker rebuild of other layers
|
|
||||||
FROM alpine as ffmpeg
|
|
||||||
ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz
|
|
||||||
RUN wget ${FFMPEG_URL} -O - | tar Jxf - \
|
|
||||||
&& mkdir ffmpeg-bin \
|
|
||||||
&& mv ffmpeg*/ffmpeg ffmpeg-bin \
|
|
||||||
&& mv ffmpeg*/ffprobe ffmpeg-bin
|
|
||||||
|
|
||||||
|
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
|
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
|
||||||
WORKDIR /repo
|
WORKDIR /repo
|
||||||
COPY . .
|
COPY . .
|
||||||
@ -20,7 +10,7 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
|||||||
--output /jellyfin \
|
--output /jellyfin \
|
||||||
Jellyfin.Server
|
Jellyfin.Server
|
||||||
|
|
||||||
|
FROM jrottenberg/ffmpeg:4.0-scratch as ffmpeg
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
||||||
# libfontconfig1 is required for Skia
|
# libfontconfig1 is required for Skia
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
@ -29,8 +19,8 @@ RUN apt-get update \
|
|||||||
&& apt-get clean autoclean \
|
&& apt-get clean autoclean \
|
||||||
&& apt-get autoremove \
|
&& apt-get autoremove \
|
||||||
&& rm -rf /var/lib/{apt,dpkg,cache,log}
|
&& rm -rf /var/lib/{apt,dpkg,cache,log}
|
||||||
|
COPY --from=ffmpeg / /
|
||||||
COPY --from=builder /jellyfin /jellyfin
|
COPY --from=builder /jellyfin /jellyfin
|
||||||
COPY --from=ffmpeg /ffmpeg-bin/* /usr/bin/
|
|
||||||
EXPOSE 8096
|
EXPOSE 8096
|
||||||
VOLUME /config /media
|
VOLUME /config /media
|
||||||
ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
|
ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
|
||||||
|
Loading…
Reference in New Issue
Block a user