From 2961dc0bdddaa06525b2d57b7ab1a7f1aac9a214 Mon Sep 17 00:00:00 2001
From: bfayers <bfayers@users.noreply.github.com>
Date: Fri, 4 Jan 2019 20:04:58 +0000
Subject: [PATCH 1/4] use ffmpeg 4.0.3 instead of distro provided (fixes
 chromecast + androidtv)

---
 Dockerfile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f5e3452250..c27ab55196 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,9 +10,23 @@ RUN export DOTNET_CLI_TELEMETRY_OPTOUT=1 \
 FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
 COPY --from=builder /jellyfin /jellyfin
 EXPOSE 8096
-RUN apt update \
- && apt install -y ffmpeg
+
+#RUN apt update \
+# && apt install -y ffmpeg
+#Use a ffmpeg 4.0.3 build for now, until we have our own (fixes chromecasts and androidtv app)
+
 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
+
+
 ENTRYPOINT if [ -n "$PUID$PGUID" ]; \
     then echo "PUID/PGID are deprecated. Use Docker user param." >&2; exit 1; \
     else dotnet /jellyfin/jellyfin.dll -programdata /config; fi

From bf61c20408ad8cdafe340e028c134ff22fb84968 Mon Sep 17 00:00:00 2001
From: bfayers <bfayers@users.noreply.github.com>
Date: Sat, 5 Jan 2019 00:19:42 +0000
Subject: [PATCH 2/4] remove commented apt installs for ffmpeg

---
 Dockerfile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index c27ab55196..132e1d5cd8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,10 +11,6 @@ FROM microsoft/dotnet:${DOTNET_VERSION}-runtime
 COPY --from=builder /jellyfin /jellyfin
 EXPOSE 8096
 
-#RUN apt update \
-# && apt install -y ffmpeg
-#Use a ffmpeg 4.0.3 build for now, until we have our own (fixes chromecasts and androidtv app)
-
 VOLUME /config /media
 
 RUN apt update

From 4c03616affe954c84a2a30291526e9a4893d555b Mon Sep 17 00:00:00 2001
From: bfayers <bfayers@users.noreply.github.com>
Date: Sat, 5 Jan 2019 00:28:40 +0000
Subject: [PATCH 3/4] 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

---
 Dockerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 132e1d5cd8..ccb1364607 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; \

From 227f9da3e5f5a247e9b85abe2d150aa5ffe9fc72 Mon Sep 17 00:00:00 2001
From: bfayers <bfayers@users.noreply.github.com>
Date: Sat, 5 Jan 2019 00:41:23 +0000
Subject: [PATCH 4/4] helps if the arg is within that bit of the dockerfile

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index ccb1364607..47414ad122 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 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
@@ -14,6 +13,7 @@ EXPOSE 8096
 
 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 \