diff options
| author | bfayers <bfayers@users.noreply.github.com> | 2019-01-05 00:28:40 +0000 |
|---|---|---|
| committer | bfayers <bfayers@users.noreply.github.com> | 2019-01-05 00:28:40 +0000 |
| commit | 4c03616affe954c84a2a30291526e9a4893d555b (patch) | |
| tree | a76ed1c45dd62f5f6855b3f19134529eac025688 | |
| parent | bf61c20408ad8cdafe340e028c134ff22fb84968 (diff) | |
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
| -rw-r--r-- | Dockerfile | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/Dockerfile b/Dockerfile index 132e1d5cd..ccb136460 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ 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 WORKDIR /repo @@ -13,15 +14,10 @@ EXPOSE 8096 VOLUME /config /media -RUN apt update -RUN apt install -y wget xz-utils -RUN mkdir /ffmpeg -WORKDIR /ffmpeg -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 - +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" ]; \ then echo "PUID/PGID are deprecated. Use Docker user param." >&2; exit 1; \ |