Browse Source

upgrade from ffmpeg 4.4 to 5.0 (#581)

pull/582/head
Jason Dove 5 years ago committed by GitHub
parent
commit
e4231cb57d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      CHANGELOG.md
  2. 16
      ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
  3. 2
      docker/Dockerfile
  4. 2
      docker/nvidia/Dockerfile
  5. 2
      docker/nvidia/ffmpeg.Dockerfile
  6. 2
      docker/vaapi/Dockerfile
  7. 2
      docker/vaapi/ffmpeg.Dockerfile

4
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` - 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 - 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 ## [0.3.7-alpha] - 2022-01-17
### Fixed ### Fixed
- Fix local folder scanners to properly detect removed/re-added folders with unchanged contents - Fix local folder scanners to properly detect removed/re-added folders with unchanged contents

16
ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs

@ -11,7 +11,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks
{ {
public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
{ {
private const string BundledVersion = "N-105153-g8abc192236"; private const string BundledVersion = "N-105324-g0f5fd44dc9";
private readonly IConfigElementRepository _configElementRepository; private readonly IConfigElementRepository _configElementRepository;
public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository)
@ -71,19 +71,15 @@ namespace ErsatzTV.Infrastructure.Health.Checks
private Option<HealthCheckResult> ValidateVersion(string version, string app) private Option<HealthCheckResult> 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!"); return WarningResult(
} $"{app} version {version} is unexpected and may have problems; please install 5.0!");
if (!version.StartsWith("4.4") && version != BundledVersion)
{
return WarningResult($"{app} version {version} is unexpected and may have problems; please install 4.4!");
} }
return None; return None;

2
docker/Dockerfile

@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime 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 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata

2
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} 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 # final stage/image
FROM jasongdove/ffmpeg:4.4-nvidia2004 AS runtime-base FROM jasongdove/ffmpeg:5.0-nvidia2004 AS runtime-base
WORKDIR /app WORKDIR /app
EXPOSE 8409 EXPOSE 8409
COPY --from=build /app ./ COPY --from=build /app ./

2
docker/nvidia/ffmpeg.Dockerfile

@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime 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 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
RUN apt-get update \ RUN apt-get update \
&& DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata \ && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev tzdata \

2
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} 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 # final stage/image
FROM jasongdove/ffmpeg:4.4-vaapi2004 AS runtime-base FROM jasongdove/ffmpeg:5.0-vaapi2004 AS runtime-base
WORKDIR /app WORKDIR /app
EXPOSE 8409 EXPOSE 8409
COPY --from=build /app ./ COPY --from=build /app ./

2
docker/vaapi/ffmpeg.Dockerfile

@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/aspnet:6.0-focal-amd64 AS dotnet-runtime 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 COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev \ RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y libicu-dev \
tzdata \ tzdata \

Loading…
Cancel
Save