mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
Merge pull request #469 from nvllsvm/ffmpeg_layarg
Download ffmpeg in a separate layer
This commit is contained in:
commit
0b804629b8
19
Dockerfile
19
Dockerfile
@ -1,5 +1,15 @@
|
|||||||
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 . .
|
||||||
@ -7,17 +17,12 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
|||||||
&& dotnet clean \
|
&& dotnet clean \
|
||||||
&& dotnet publish --configuration release --output /jellyfin
|
&& dotnet publish --configuration release --output /jellyfin
|
||||||
|
|
||||||
|
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
||||||
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
|
||||||
|
|
||||||
ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz
|
|
||||||
RUN apt update \
|
RUN apt update \
|
||||||
&& apt install -y xz-utils \
|
|
||||||
&& curl ${FFMPEG_URL} | tar Jxf - -C /usr/bin --wildcards --strip-components=1 ffmpeg*/ffmpeg ffmpeg*/ffprobe \
|
|
||||||
&& apt remove -y xz-utils \
|
|
||||||
&& apt install -y libfontconfig1 # needed for Skia
|
&& apt install -y libfontconfig1 # needed for Skia
|
||||||
|
|
||||||
ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
|
ENTRYPOINT dotnet /jellyfin/jellyfin.dll -programdata /config
|
||||||
|
Loading…
Reference in New Issue
Block a user