From 7c846d2dce25bd59c908b37aa0b6c43f44628464 Mon Sep 17 00:00:00 2001 From: ConfusedPolarBear <33811686+ConfusedPolarBear@users.noreply.github.com> Date: Fri, 10 Jun 2022 22:17:18 -0500 Subject: [PATCH] Remove ffmpeg5 dockerfile --- docker/Dockerfile | 4 +--- docker/Dockerfile.ffmpeg5 | 10 ---------- docker/README.md | 5 ----- 3 files changed, 1 insertion(+), 18 deletions(-) delete mode 100644 docker/Dockerfile.ffmpeg5 diff --git a/docker/Dockerfile b/docker/Dockerfile index a5774f4..b188eb8 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,3 @@ -FROM jellyfin/jellyfin:10.8.0-beta2 - -RUN apt update && apt install -y libchromaprint-tools +FROM jellyfin/jellyfin:10.8.0 COPY dist/ /jellyfin/jellyfin-web/ diff --git a/docker/Dockerfile.ffmpeg5 b/docker/Dockerfile.ffmpeg5 deleted file mode 100644 index 36358c1..0000000 --- a/docker/Dockerfile.ffmpeg5 +++ /dev/null @@ -1,10 +0,0 @@ -FROM jellyfin/jellyfin:10.8.0-beta3 - -RUN curl -Lo jellyfin-ffmpeg5.deb \ - https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v5.0.1-5/jellyfin-ffmpeg5_5.0.1-5-bullseye_amd64.deb - -RUN apt update -RUN apt install -y libxcb-randr0 -RUN dpkg -i jellyfin-ffmpeg5.deb - -COPY dist/ /jellyfin/jellyfin-web/ diff --git a/docker/README.md b/docker/README.md index 11f158e..eaa5124 100644 --- a/docker/README.md +++ b/docker/README.md @@ -4,8 +4,3 @@ Build instructions for the `ghcr.io/confusedpolarbear/jellyfin-intro-skipper` co 2. Run `npm run build:production` 3. Copy the `dist` folder into this folder 4. Run `docker build .` - -## `Dockerfile.ffmpeg5` testing instructions - -1. Follow steps 1 - 3 above (only needed if you don't use the automatic skip feature) -2. Run `docker build . -t jellyfin-ffmpeg5 -f Dockerfile.ffmpeg5`