From 2ee8679ebae02090a2d69bfb679acbde34a88f11 Mon Sep 17 00:00:00 2001
From: davidry <32561343+davidry@users.noreply.github.com>
Date: Mon, 17 Jun 2024 18:14:30 +1200
Subject: [PATCH] mkvtoolnix update (#1029)

* mkvtoolnix update

Add mkvtoolnix Ubuntu repository, allowing latest version of mkvtoolnix (Ubuntu has up to 45.0.0-2, current in this repo is 81.0-0 )

* Change install order and format commands

---------

Co-authored-by: HaveAGitGat <43864057+HaveAGitGat@users.noreply.github.com>
---
 docker/Dockerfile.base | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base
index 14d6f38..0f3b44c 100644
--- a/docker/Dockerfile.base
+++ b/docker/Dockerfile.base
@@ -22,12 +22,19 @@ RUN apt-get update &&  \
     "${HOME}" && \
     # useradd -u ${PUID} -U -d ${HOME} -s /bin/false Tdarr && \
     # usermod -G users Tdarr && \
-    
+
     apt-get update && \
-    apt-get install -y curl unzip mkvtoolnix comskip \
+    apt-get install -y curl unzip wget comskip \
         # for apprise
         python3-pip && \
         pip3 install apprise && \
+
+    # MkvToolNIX
+    wget -O /usr/share/keyrings/gpg-pub-moritzbunkus.gpg https://mkvtoolnix.download/gpg-pub-moritzbunkus.gpg && \
+    echo "deb [arch=amd64 signed-by=/usr/share/keyrings/gpg-pub-moritzbunkus.gpg] https://mkvtoolnix.download/ubuntu/ jammy main" | tee /etc/apt/sources.list.d/mkvtoolnix.download.list && \
+    echo "deb-src [arch=amd64 signed-by=/usr/share/keyrings/gpg-pub-moritzbunkus.gpg] https://mkvtoolnix.download/ubuntu/ jammy main" | tee -a /etc/apt/sources.list.d/mkvtoolnix.download.list && \
+    apt-get update && apt-get install -y mkvtoolnix && \
+
     #cc-extractor
     apt-get install -y \
         libglew-dev \
@@ -85,8 +92,6 @@ RUN apt-get update &&  \
             clinfo && \
 
         # FFmpeg 6
-        apt install -y \
-        wget && \
         ffmpegversion=$(curl --silent https://api.github.com/repos/jellyfin/jellyfin-ffmpeg/releases/latest | grep -oP '"tag_name":\s*"v\K[^"]+' | sort -h | tail -n1) && \
         wget https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v$ffmpegversion/jellyfin-ffmpeg6_$ffmpegversion-jammy_amd64.deb && \
         apt install -y \