diff --git a/CHANGELOG.md b/CHANGELOG.md index ceec5d4a7..2ca67c91d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - The issue appears to be caused by using a thread count other than `1` - Thread count is now forced to `1` for all streaming modes other than HLS Segmenter +### Changed +- Upgrade ffmpeg from 4.4 to 5.0 in all docker images + - Upgrading from 4.4 to 5.0 is recommended for all installations + ## [0.3.7-alpha] - 2022-01-17 ### Fixed - Fix local folder scanners to properly detect removed/re-added folders with unchanged contents diff --git a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs index 8003ff59f..47171ec16 100644 --- a/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs +++ b/ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs @@ -11,7 +11,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks { public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck { - private const string BundledVersion = "N-105153-g8abc192236"; + private const string BundledVersion = "N-105324-g0f5fd44dc9"; private readonly IConfigElementRepository _configElementRepository; public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) @@ -71,19 +71,15 @@ namespace ErsatzTV.Infrastructure.Health.Checks private Option ValidateVersion(string version, string app) { - if (version.StartsWith("3.")) + if (version.StartsWith("3.") || version.StartsWith("4.")) { - return FailResult($"{app} version {version} is too old; please install 4.4!"); + return FailResult($"{app} version {version} is too old; please install 5.0!"); } - if (version.StartsWith("4.3")) + if (!version.StartsWith("5.0") && version != BundledVersion) { - return WarningResult($"{app} version 4.4 is now supported, please upgrade from 4.3!"); - } - - if (!version.StartsWith("4.4") && version != BundledVersion) - { - return WarningResult($"{app} version {version} is unexpected and may have problems; please install 4.4!"); + return WarningResult( + $"{app} version {version} is unexpected and may have problems; please install 5.0!"); } return None; diff --git a/docker/Dockerfile b/docker/Dockerfile index 7aa6baa5d..193b38c21 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime -FROM jasongdove/ffmpeg:4.4-ubuntu2004 AS runtime-base +FROM jasongdove/ffmpeg:5.0-ubuntu2004 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 diff --git a/docker/nvidia/Dockerfile b/docker/nvidia/Dockerfile index 7753e967c..4d1ae6fd0 100644 --- a/docker/nvidia/Dockerfile +++ b/docker/nvidia/Dockerfile @@ -25,7 +25,7 @@ ARG INFO_VERSION="unknown" RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} # final stage/image -FROM jasongdove/ffmpeg:4.4-nvidia2004 AS runtime-base +FROM jasongdove/ffmpeg:5.0-nvidia2004 AS runtime-base WORKDIR /app EXPOSE 8409 COPY --from=build /app ./ diff --git a/docker/nvidia/ffmpeg.Dockerfile b/docker/nvidia/ffmpeg.Dockerfile index e15ba848a..0aa74eb20 100644 --- a/docker/nvidia/ffmpeg.Dockerfile +++ b/docker/nvidia/ffmpeg.Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime -FROM jasongdove/ffmpeg-base:4.4-nvidia2004 AS runtime-base +FROM jasongdove/ffmpeg-base:5.0-nvidia2004 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 \ diff --git a/docker/vaapi/Dockerfile b/docker/vaapi/Dockerfile index c979ad53f..a4e78e95e 100644 --- a/docker/vaapi/Dockerfile +++ b/docker/vaapi/Dockerfile @@ -25,7 +25,7 @@ ARG INFO_VERSION="unknown" RUN dotnet publish -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} # final stage/image -FROM jasongdove/ffmpeg:4.4-vaapi2004 AS runtime-base +FROM jasongdove/ffmpeg:5.0-vaapi2004 AS runtime-base WORKDIR /app EXPOSE 8409 COPY --from=build /app ./ diff --git a/docker/vaapi/ffmpeg.Dockerfile b/docker/vaapi/ffmpeg.Dockerfile index 7d14939ae..8d0a22441 100644 --- a/docker/vaapi/ffmpeg.Dockerfile +++ b/docker/vaapi/ffmpeg.Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime -FROM jasongdove/ffmpeg-base:4.4-vaapi2004 AS runtime-base +FROM jasongdove/ffmpeg-base:5.0-vaapi2004 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 \