From cd3c14961f9acfce29bdff14da9fcbc063a40257 Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Sat, 19 Oct 2019 19:32:19 -0400
Subject: [PATCH 1/3] Default to jellyfin-web master

---
 Dockerfile       | 2 +-
 Dockerfile.arm   | 2 +-
 Dockerfile.arm64 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 118acfc0f4..7fe55d5445 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,7 +2,7 @@ ARG DOTNET_VERSION=2.2
 ARG FFMPEG_VERSION=latest
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.5.0
+ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
diff --git a/Dockerfile.arm b/Dockerfile.arm
index ec710620a7..7999621ba5 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -4,7 +4,7 @@ ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.5.0
+ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 30de0bab49..29ce318697 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -4,7 +4,7 @@ ARG DOTNET_VERSION=3.0
 
 
 FROM node:alpine as web-builder
-ARG JELLYFIN_WEB_VERSION=v10.5.0
+ARG JELLYFIN_WEB_VERSION=master
 RUN apk add curl \
  && curl -L https://github.com/jellyfin/jellyfin-web/archive/${JELLYFIN_WEB_VERSION}.tar.gz | tar zxf - \
  && cd jellyfin-web-* \

From 64eca9e1c74c3a22008d06569c992ef0ec428e9c Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Sat, 19 Oct 2019 19:36:56 -0400
Subject: [PATCH 2/3] Update Docker containers to dotnet 3.0

---
 Dockerfile       | 2 +-
 Dockerfile.arm   | 2 --
 Dockerfile.arm64 | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7fe55d5445..6c938a557a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG DOTNET_VERSION=2.2
+ARG DOTNET_VERSION=3.0
 ARG FFMPEG_VERSION=latest
 
 FROM node:alpine as web-builder
diff --git a/Dockerfile.arm b/Dockerfile.arm
index 7999621ba5..92af225301 100644
--- a/Dockerfile.arm
+++ b/Dockerfile.arm
@@ -17,8 +17,6 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
-# TODO Remove or update the sed line when we update dotnet version.
-RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 29ce318697..7dbdd1f06b 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -17,8 +17,6 @@ FROM mcr.microsoft.com/dotnet/core/sdk:${DOTNET_VERSION} as builder
 WORKDIR /repo
 COPY . .
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
-# TODO Remove or update the sed line when we update dotnet version.
-RUN find . -type f -exec sed -i 's/netcoreapp2.1/netcoreapp3.0/g' {} \;
 # Discard objs - may cause failures if exists
 RUN find . -type d -name obj | xargs -r rm -r
 # Build

From 4ace99ad76ef811b0e2d7ab43550d7faa96eec7d Mon Sep 17 00:00:00 2001
From: Andrew Rabert <ar@nullsum.net>
Date: Sat, 19 Oct 2019 20:00:54 -0400
Subject: [PATCH 3/3] Fix Docker ffmpeg

---
 Dockerfile | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6c938a557a..e2e23da7f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -19,20 +19,24 @@ RUN dotnet publish Jellyfin.Server --configuration Release --output="/jellyfin"
 FROM jellyfin/ffmpeg:${FFMPEG_VERSION} as ffmpeg
 
 FROM mcr.microsoft.com/dotnet/core/runtime:${DOTNET_VERSION}
-COPY --from=ffmpeg / /
+COPY --from=ffmpeg /opt/ffmpeg /opt/ffmpeg
 COPY --from=builder /jellyfin /jellyfin
 COPY --from=web-builder /dist /jellyfin/jellyfin-web
 # Install dependencies:
 #   libfontconfig1: needed for Skia
+#   libgomp1: needed for ffmpeg
+#   libva-drm2: needed for ffmpeg
 #   mesa-va-drivers: needed for VAAPI
 RUN apt-get update \
  && apt-get install --no-install-recommends --no-install-suggests -y \
-   libfontconfig1 mesa-va-drivers \
+   libfontconfig1 libgomp1 libva-drm2 mesa-va-drivers \
  && apt-get clean autoclean \
  && apt-get autoremove \
  && rm -rf /var/lib/apt/lists/* \
  && mkdir -p /cache /config /media \
- && chmod 777 /cache /config /media
+ && chmod 777 /cache /config /media \
+ && ln -s /opt/ffmpeg/bin/ffmpeg /usr/local/bin \
+ && ln -s /opt/ffmpeg/bin/ffprobe /usr/local/bin
 
 EXPOSE 8096
 VOLUME /cache /config /media