Merge pull request #411 from bfayers/docker-ffmpeg403
Change Dockerfile to use ffmpeg 4.0.3 rather than a distro one.
This commit is contained in:
commit
893e7c5a65
10
Dockerfile
10
Dockerfile
|
@ -10,9 +10,15 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
|
||||||
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
|
||||||
COPY --from=builder /jellyfin /jellyfin
|
COPY --from=builder /jellyfin /jellyfin
|
||||||
EXPOSE 8096
|
EXPOSE 8096
|
||||||
RUN apt update \
|
|
||||||
&& apt install -y ffmpeg
|
|
||||||
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 \
|
||||||
|
&& 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
|
||||||
|
|
||||||
ENTRYPOINT if [ -n "$PUID$PGUID" ]; \
|
ENTRYPOINT if [ -n "$PUID$PGUID" ]; \
|
||||||
then echo "PUID/PGID are deprecated. Use Docker user param." >&2; exit 1; \
|
then echo "PUID/PGID are deprecated. Use Docker user param." >&2; exit 1; \
|
||||||
else dotnet /jellyfin/jellyfin.dll -programdata /config; fi
|
else dotnet /jellyfin/jellyfin.dll -programdata /config; fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user