pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

clean up how extracting tar is done; just put it in /usr/bin instead of symlinks; remove xz-utils after (cleaning up space); all at request of nvllsvm

This commit is contained in:
bfayers 2019-01-05 00:28:40 +00:00
parent bf61c20408
commit 4c03616aff
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Dockerfile
View File

@ -1,4 +1,5 @@
ARG DOTNET_VERSION=2 ARG DOTNET_VERSION=2
ARG FFMPEG_URL=https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz
FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder FROM microsoft/dotnet:${DOTNET_VERSION}-sdk as builder
WORKDIR /repo WORKDIR /repo
@ -13,15 +14,10 @@ EXPOSE 8096
VOLUME /config /media VOLUME /config /media
RUN apt update RUN apt update \
RUN apt install -y wget xz-utils && apt install -y xz-utils \
RUN mkdir /ffmpeg && curl ${FFMPEG_URL} | tar Jxf - -C /usr/bin --wildcards --strip-components=1 ffmpeg*/ffmpeg ffmpeg*/ffprobe \
WORKDIR /ffmpeg && apt remove -y xz-utils
RUN wget https://www.johnvansickle.com/ffmpeg/old-releases/ffmpeg-4.0.3-64bit-static.tar.xz
RUN tar xf /ffmpeg/ffmpeg-4.0.3-64bit-static.tar.xz
RUN ln -s /ffmpeg/ffmpeg-4.0.3-64bit-static/ffmpeg /usr/local/sbin/ffmpeg
RUN ln -s /ffmpeg/ffmpeg-4.0.3-64bit-static/ffprobe /usr/local/sbin/ffprobe
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; \