use release version of ffmpeg 6.1 (#1505)

.github/workflows/artifacts.yml

@@ -204,7 +204,7 @@ jobs:
         id: downloadffmpeg
         name: Download ffmpeg
         with:
-          url: "https://github.com/GyanD/codexffmpeg/releases/download/2023-10-16-git-5ddab49d48/ffmpeg-2023-10-16-git-5ddab49d48-full_build.7z"
+          url: "https://github.com/GyanD/codexffmpeg/releases/download/6.1/ffmpeg-6.1-full_build.7z"
           target: ffmpeg/
 
       - name: Build

ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs

@@ -8,9 +8,9 @@ namespace ErsatzTV.Infrastructure.Health.Checks;
 
 public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
 {
-    private const string BundledVersion = "N-112071-g00a837c70c";
+    private const string BundledVersion = "6.1";
-    private const string BundledVersionVaapi = "N-112071-g00a837c70c";
+    private const string BundledVersionVaapi = "6.1";
-    private const string WindowsVersionPrefix = "2023-10-04-git-9078dc0c52";
+    private const string WindowsVersionPrefix = "6.1";
     private readonly IConfigElementRepository _configElementRepository;
 
     public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) =>
@@ -77,7 +77,7 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe
             version.StartsWith("4.", StringComparison.OrdinalIgnoreCase) ||
             version.StartsWith("5.", StringComparison.OrdinalIgnoreCase))
         {
-            return FailResult($"{app} version {version} is too old; please install 6.1 (snapshot)!");
+            return FailResult($"{app} version {version} is too old; please install 6.1!");
         }
 
         if (!version.StartsWith("6.1", StringComparison.OrdinalIgnoreCase) &&
@@ -86,7 +86,7 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe
             version != BundledVersionVaapi)
         {
             return WarningResult(
-                $"{app} version {version} is unexpected and may have problems; please install 6.1 (snapshot)!");
+                $"{app} version {version} is unexpected and may have problems; please install 6.1!");
         }
 
         return None;

docker/Dockerfile

@@ -40,9 +40,8 @@ RUN sed -i '/Scanner/d' ErsatzTV.csproj
 RUN dotnet publish ErsatzTV.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
 
 # final stage/image
-FROM jasongdove/ersatztv-ffmpeg:6.0 AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:6.1 AS runtime-base
 ENV FONTCONFIG_PATH=/etc/fonts
-RUN apt-get update && apt-get install -y fonts-noto-cjk && apt-get clean
 RUN fc-cache update
 WORKDIR /app
 EXPOSE 8409

docker/arm32v7/Dockerfile

@@ -1,13 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm32v7 AS dotnet-runtime
 
-FROM jasongdove/ersatztv-ffmpeg:6.0-arm AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:6.1-arm AS runtime-base
 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
-RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev \
-    tzdata \
-    fontconfig \
-    fonts-dejavu \
-    fonts-noto-cjk \
-    libgdiplus
 
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-amd64 AS build

docker/arm64/Dockerfile

@@ -1,13 +1,7 @@
 FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm64v8 AS dotnet-runtime
 
-FROM jasongdove/ersatztv-ffmpeg:6.0-arm64 AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:6.1-arm64 AS runtime-base
 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
-RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev \
-    tzdata \
-    fontconfig \
-    fonts-dejavu \
-    fonts-noto-cjk \
-    libgdiplus
 
 # https://hub.docker.com/_/microsoft-dotnet
 FROM mcr.microsoft.com/dotnet/sdk:7.0-jammy-amd64 AS build

docker/nvidia/Dockerfile

@@ -40,9 +40,8 @@ RUN sed -i '/Scanner/d' ErsatzTV.csproj
 RUN dotnet publish ErsatzTV.csproj --framework net7.0 -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
 
 # final stage/image
-FROM jasongdove/ersatztv-ffmpeg:6.0-nvidia AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:6.1-nvidia AS runtime-base
 ENV FONTCONFIG_PATH=/etc/fonts
-RUN apt-get update && apt-get install -y fonts-noto-cjk && apt-get clean
 RUN fc-cache update
 WORKDIR /app
 EXPOSE 8409

docker/vaapi/Dockerfile

@@ -40,9 +40,8 @@ RUN sed -i '/Scanner/d' ErsatzTV.csproj
 RUN dotnet publish ErsatzTV.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION}
 
 # final stage/image
-FROM jasongdove/ersatztv-ffmpeg:6.0-vaapi AS runtime-base
+FROM jasongdove/ersatztv-ffmpeg:6.1-vaapi AS runtime-base
 ENV FONTCONFIG_PATH=/etc/fonts
-RUN apt-get update && apt-get install -y fonts-noto-cjk && apt-get clean
 RUN fc-cache update
 WORKDIR /app
 EXPOSE 8409