From d3f81635804676489cfc44ea7c585887f983cf76 Mon Sep 17 00:00:00 2001 From: Jason Dove <1695733+jasongdove@users.noreply.github.com> Date: Thu, 24 Jul 2025 20:27:06 +0000 Subject: [PATCH] use updated ersatztv-ffmpeg base images (#2198) --- docker/Dockerfile | 2 +- docker/arm32v7/Dockerfile | 2 +- docker/arm64/Dockerfile | 2 +- docker/docker-compose.nvidia.yml | 2 +- docker/docker-compose.vaapi.yml | 2 +- docker/ffmpeg-tests/Dockerfile | 2 +- docker/nvidia/Dockerfile | 49 -------------------------------- docker/vaapi/Dockerfile | 48 ------------------------------- 8 files changed, 6 insertions(+), 103 deletions(-) delete mode 100644 docker/nvidia/Dockerfile delete mode 100644 docker/vaapi/Dockerfile diff --git a/docker/Dockerfile b/docker/Dockerfile index b5d5cb9f4..aad59dc3b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-amd64 AS dotnet-runtime -FROM jasongdove/ersatztv-ffmpeg:7.1.1 AS runtime-base +FROM --platform=linux/amd64 ghcr.io/ersatztv/ersatztv:ffmpeg-7.1.1 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet # https://hub.docker.com/_/microsoft-dotnet diff --git a/docker/arm32v7/Dockerfile b/docker/arm32v7/Dockerfile index 0ed74d5e1..3167aab03 100644 --- a/docker/arm32v7/Dockerfile +++ b/docker/arm32v7/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-arm32v7 AS dotnet-runtime -FROM jasongdove/ersatztv-ffmpeg:7.1.1-arm AS runtime-base +FROM --platform=linux/arm/v7 ghcr.io/ersatztv/ersatztv:ffmpeg-7.1.1 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet # https://hub.docker.com/_/microsoft-dotnet diff --git a/docker/arm64/Dockerfile b/docker/arm64/Dockerfile index 2514bf1d2..95a2f3ef5 100644 --- a/docker/arm64/Dockerfile +++ b/docker/arm64/Dockerfile @@ -1,6 +1,6 @@ FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-arm64v8 AS dotnet-runtime -FROM jasongdove/ersatztv-ffmpeg:7.1.1-arm64 AS runtime-base +FROM --platform=linux/arm64 ghcr.io/ersatztv/ersatztv:ffmpeg-7.1.1 AS runtime-base COPY --from=dotnet-runtime /usr/share/dotnet /usr/share/dotnet # https://hub.docker.com/_/microsoft-dotnet diff --git a/docker/docker-compose.nvidia.yml b/docker/docker-compose.nvidia.yml index f2b169a17..27e046e0a 100644 --- a/docker/docker-compose.nvidia.yml +++ b/docker/docker-compose.nvidia.yml @@ -3,7 +3,7 @@ privileged: true build: context: .. - dockerfile: docker/nvidia/Dockerfile + dockerfile: docker/Dockerfile environment: NVIDIA_VISIBLE_DEVICES: all NVIDIA_DRIVER_CAPABILITIES: compute,utility,video diff --git a/docker/docker-compose.vaapi.yml b/docker/docker-compose.vaapi.yml index 450d82e67..0db7d525d 100644 --- a/docker/docker-compose.vaapi.yml +++ b/docker/docker-compose.vaapi.yml @@ -1,6 +1,6 @@ services: ersatztv: build: - dockerfile: docker/vaapi/Dockerfile + dockerfile: docker/Dockerfile devices: - /dev/dri/renderD128:/dev/dri/renderD128 diff --git a/docker/ffmpeg-tests/Dockerfile b/docker/ffmpeg-tests/Dockerfile index 5811e0ca0..bbd3a9fa9 100644 --- a/docker/ffmpeg-tests/Dockerfile +++ b/docker/ffmpeg-tests/Dockerfile @@ -1,4 +1,4 @@ -FROM jasongdove/ersatztv-ffmpeg:7.1.1 +FROM ghcr.io/ersatztv/ersatztv:ffmpeg-7.1.1 RUN apt-get update && apt-get install -y ca-certificates gnupg mkvtoolnix && \ curl -L https://dot.net/v1/dotnet-install.sh -o dotnet-install.sh && \ chmod +x ./dotnet-install.sh && \ diff --git a/docker/nvidia/Dockerfile b/docker/nvidia/Dockerfile deleted file mode 100644 index b5d5cb9f4..000000000 --- a/docker/nvidia/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-amd64 AS dotnet-runtime - -FROM jasongdove/ersatztv-ffmpeg:7.1.1 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:9.0-noble-amd64 AS build -RUN apt-get update && apt-get install -y ca-certificates gnupg -WORKDIR /source - -# copy csproj and restore as distinct layers -COPY *.sln . -COPY artwork/* ./artwork/ -COPY ErsatzTV/*.csproj ./ErsatzTV/ -COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/ -COPY ErsatzTV.Core/*.csproj ./ErsatzTV.Core/ -COPY ErsatzTV.FFmpeg/*.csproj ./ErsatzTV.FFmpeg/ -COPY ErsatzTV.Infrastructure/*.csproj ./ErsatzTV.Infrastructure/ -COPY ErsatzTV.Infrastructure.Sqlite/*.csproj ./ErsatzTV.Infrastructure.Sqlite/ -COPY ErsatzTV.Infrastructure.MySql/*.csproj ./ErsatzTV.Infrastructure.MySql/ -COPY ErsatzTV.Scanner/*.csproj ./ErsatzTV.Scanner/ -RUN dotnet restore -r linux-x64 ErsatzTV/ - -# copy everything else and build app -COPY ErsatzTV/. ./ErsatzTV/ -COPY ErsatzTV.Application/. ./ErsatzTV.Application/ -COPY ErsatzTV.Core/. ./ErsatzTV.Core/ -COPY ErsatzTV.FFmpeg/. ./ErsatzTV.FFmpeg/ -COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/ -COPY ErsatzTV.Infrastructure.Sqlite/. ./ErsatzTV.Infrastructure.Sqlite/ -COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/ -COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/ -ARG INFO_VERSION="unknown" -WORKDIR /source/ErsatzTV.Scanner -RUN dotnet publish ErsatzTV.Scanner.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} -WORKDIR /source/ErsatzTV -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 runtime-base -ENV FONTCONFIG_PATH=/etc/fonts -RUN fc-cache update -WORKDIR /app -COPY --from=build /app ./ -ENV ETV_CONFIG_FOLDER=/config -ENV ETV_TRANSCODE_FOLDER=/transcode -ENV ETV_DISABLE_VULKAN=1 -ENTRYPOINT ["./ErsatzTV"] diff --git a/docker/vaapi/Dockerfile b/docker/vaapi/Dockerfile deleted file mode 100644 index 6a1916682..000000000 --- a/docker/vaapi/Dockerfile +++ /dev/null @@ -1,48 +0,0 @@ -FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-amd64 AS dotnet-runtime - -FROM jasongdove/ersatztv-ffmpeg:7.1.1 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:9.0-noble-amd64 AS build -RUN apt-get update && apt-get install -y ca-certificates gnupg -WORKDIR /source - -# copy csproj and restore as distinct layers -COPY *.sln . -COPY artwork/* ./artwork/ -COPY ErsatzTV/*.csproj ./ErsatzTV/ -COPY ErsatzTV.Application/*.csproj ./ErsatzTV.Application/ -COPY ErsatzTV.Core/*.csproj ./ErsatzTV.Core/ -COPY ErsatzTV.FFmpeg/*.csproj ./ErsatzTV.FFmpeg/ -COPY ErsatzTV.Infrastructure/*.csproj ./ErsatzTV.Infrastructure/ -COPY ErsatzTV.Infrastructure.Sqlite/*.csproj ./ErsatzTV.Infrastructure.Sqlite/ -COPY ErsatzTV.Infrastructure.MySql/*.csproj ./ErsatzTV.Infrastructure.MySql/ -COPY ErsatzTV.Scanner/*.csproj ./ErsatzTV.Scanner/ -RUN dotnet restore -r linux-x64 ErsatzTV/ - -# copy everything else and build app -COPY ErsatzTV/. ./ErsatzTV/ -COPY ErsatzTV.Application/. ./ErsatzTV.Application/ -COPY ErsatzTV.Core/. ./ErsatzTV.Core/ -COPY ErsatzTV.FFmpeg/. ./ErsatzTV.FFmpeg/ -COPY ErsatzTV.Infrastructure/. ./ErsatzTV.Infrastructure/ -COPY ErsatzTV.Infrastructure.Sqlite/. ./ErsatzTV.Infrastructure.Sqlite/ -COPY ErsatzTV.Infrastructure.MySql/. ./ErsatzTV.Infrastructure.MySql/ -COPY ErsatzTV.Scanner/. ./ErsatzTV.Scanner/ -ARG INFO_VERSION="unknown" -WORKDIR /source/ErsatzTV.Scanner -RUN dotnet publish ErsatzTV.Scanner.csproj -c release -o /app -r linux-x64 --self-contained false --no-restore /p:DebugType=Embedded /p:InformationalVersion=${INFO_VERSION} -WORKDIR /source/ErsatzTV -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 runtime-base -ENV FONTCONFIG_PATH=/etc/fonts -RUN fc-cache update -WORKDIR /app -COPY --from=build /app ./ -ENV ETV_CONFIG_FOLDER=/config -ENV ETV_TRANSCODE_FOLDER=/transcode -ENTRYPOINT ["./ErsatzTV"]