Browse Source

rever vaapi docker to ffmpeg 6.1 (#1681)

pull/1683/head
Jason Dove 1 year ago committed by GitHub
parent
commit
c1bedb661c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      ErsatzTV.Infrastructure/Health/Checks/FFmpegVersionHealthCheck.cs
  2. 6
      docker/vaapi/Dockerfile

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

@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks; @@ -9,7 +9,7 @@ namespace ErsatzTV.Infrastructure.Health.Checks;
public class FFmpegVersionHealthCheck : BaseHealthCheck, IFFmpegVersionHealthCheck
{
private const string BundledVersion = "7.0";
private const string BundledVersionVaapi = "7.0";
private const string BundledVersionVaapi = "6.1";
private const string WindowsVersionPrefix = "n6.1";
private static readonly string[] FFmpegVersionArguments = { "-version" };

6
docker/vaapi/Dockerfile

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-amd64 AS dotnet-runtime
#FROM mcr.microsoft.com/dotnet/aspnet:8.0-jammy-amd64 AS dotnet-runtime
FROM jasongdove/ersatztv-ffmpeg:7.0-vaapi AS runtime-base
COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
FROM jasongdove/ersatztv-ffmpeg:6.1-vaapi AS runtime-base
#COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet
# https://hub.docker.com/_/microsoft-dotnet
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build

Loading…
Cancel
Save