Browse Source

upgrade to ffmpeg 6 (#1185)

pull/1186/head
Jason Dove 3 years ago committed by GitHub
parent
commit
b2c57e7407
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/artifacts.yml
  2. 1
      CHANGELOG.md
  3. 10
      ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
  4. 2
      docker/Dockerfile
  5. 2
      docker/arm32v7/Dockerfile
  6. 2
      docker/arm64/Dockerfile
  7. 2
      docker/nvidia/Dockerfile
  8. 2
      docker/vaapi/Dockerfile

2
.github/workflows/artifacts.yml

@ -208,7 +208,7 @@ jobs:
id: downloadffmpeg id: downloadffmpeg
name: Download ffmpeg name: Download ffmpeg
with: with:
url: "https://github.com/GyanD/codexffmpeg/releases/download/5.1/ffmpeg-5.1-full_build.7z" url: "https://github.com/GyanD/codexffmpeg/releases/download/6.0/ffmpeg-6.0-full_build.7z"
target: ffmpeg/ target: ffmpeg/
- name: Build - name: Build

1
CHANGELOG.md

@ -15,6 +15,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- Fix trash page to properly display episodes with missing metadata or titles - Fix trash page to properly display episodes with missing metadata or titles
### Changed ### Changed
- Upgrade all docker images and windows builds to ffmpeg 6.0
- Plex, Jellyfin and Emby libraries now retrieve all metadata and statistics from the media server - Plex, Jellyfin and Emby libraries now retrieve all metadata and statistics from the media server
- File systems will no longer be periodically scanned for libraries using these media sources - File systems will no longer be periodically scanned for libraries using these media sources
- Plex, Jellyfin and Emby libraries now direct stream content when files are not found on ErsatzTV's file system - Plex, Jellyfin and Emby libraries now direct stream content when files are not found on ErsatzTV's file system

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

@ -8,8 +8,8 @@ namespace ErsatzTV.Infrastructure.Health.Checks;
public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
{ {
private const string BundledVersion = "5.1"; private const string BundledVersion = "6.0";
private const string BundledVersionVaapi = "N-109960-g63a02a9a04"; private const string BundledVersionVaapi = "6.0";
private readonly IConfigElementRepository _configElementRepository; private readonly IConfigElementRepository _configElementRepository;
public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) => public FFmpegVersionHealthCheck(IConfigElementRepository configElementRepository) =>
@ -72,13 +72,13 @@ public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthChe
{ {
if (version.StartsWith("3.") || version.StartsWith("4.")) if (version.StartsWith("3.") || version.StartsWith("4."))
{ {
return FailResult($"{app} version {version} is too old; please install 5.1!"); return FailResult($"{app} version {version} is too old; please install 6.0!");
} }
if (!version.StartsWith("5.1") && version != BundledVersion && version != BundledVersionVaapi) if (!version.StartsWith("6.0") && version != BundledVersion && version != BundledVersionVaapi)
{ {
return WarningResult( return WarningResult(
$"{app} version {version} is unexpected and may have problems; please install 5.1!"); $"{app} version {version} is unexpected and may have problems; please install 6.0!");
} }
return None; return None;

2
docker/Dockerfile

@ -34,7 +34,7 @@ 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} 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 # final stage/image
FROM jasongdove/ersatztv-ffmpeg:5.1.2 AS runtime-base FROM jasongdove/ersatztv-ffmpeg:6.0 AS runtime-base
ENV FONTCONFIG_PATH=/etc/fonts ENV FONTCONFIG_PATH=/etc/fonts
RUN fc-cache update RUN fc-cache update
WORKDIR /app WORKDIR /app

2
docker/arm32v7/Dockerfile

@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm32v7 AS dotnet-runtime FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm32v7 AS dotnet-runtime
FROM jasongdove/ersatztv-ffmpeg:5.1.2-arm AS runtime-base FROM jasongdove/ersatztv-ffmpeg:6.0-arm 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 \

2
docker/arm64/Dockerfile

@ -1,6 +1,6 @@
FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm64v8 AS dotnet-runtime FROM mcr.microsoft.com/dotnet/aspnet:7.0-jammy-arm64v8 AS dotnet-runtime
FROM jasongdove/ersatztv-ffmpeg:5.1.2-arm64 AS runtime-base FROM jasongdove/ersatztv-ffmpeg:6.0-arm64 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 \

2
docker/nvidia/Dockerfile

@ -34,7 +34,7 @@ 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} 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 # final stage/image
FROM jasongdove/ersatztv-ffmpeg:5.1.2-nvidia AS runtime-base FROM jasongdove/ersatztv-ffmpeg:6.0-nvidia AS runtime-base
ENV FONTCONFIG_PATH=/etc/fonts ENV FONTCONFIG_PATH=/etc/fonts
RUN fc-cache update RUN fc-cache update
WORKDIR /app WORKDIR /app

2
docker/vaapi/Dockerfile

@ -34,7 +34,7 @@ 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} 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 # final stage/image
FROM jasongdove/ersatztv-ffmpeg:5.1.2-vaapi AS runtime-base FROM jasongdove/ersatztv-ffmpeg:6.0-vaapi AS runtime-base
ENV FONTCONFIG_PATH=/etc/fonts ENV FONTCONFIG_PATH=/etc/fonts
RUN fc-cache update RUN fc-cache update
WORKDIR /app WORKDIR /app

Loading…
Cancel
Save