From a405fba3bbb2365d91241471769e5e1dc498581e Mon Sep 17 00:00:00 2001 From: Jason Rasmussen Date: Thu, 3 Aug 2023 09:54:23 -0400 Subject: [PATCH] fix(server): ffprobe not found (#3532) * fix(server): ffprobe not found * chore: remove redundant path export * chore: remove empty space --- server/Dockerfile | 1 - server/bin/install-ffmpeg.sh | 3 +++ server/build-lock.json | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/server/Dockerfile b/server/Dockerfile index 4d04b16e98..d8714c0610 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -40,7 +40,6 @@ libgsf-1-114 libopenjp2-7 liblcms2-2 liborc-0.4-0 libopenexr-3-1-30 liblqr-1-0 l mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-media-va-driver-non-free"; fi) jq wget \ && ./install-ffmpeg.sh && apt-get remove -yqq jq wget && apt-get autoremove -yqq && apt-get clean && rm -rf /var/lib/apt/lists/* \ && rm install-ffmpeg.sh && rm build-lock.json -ENV PATH=/usr/lib/jellyfin-ffmpeg:$PATH COPY --from=prod /usr/local/bin/magick /usr/local/bin/magick COPY --from=prod /usr/local/include/ImageMagick-7 /usr/local/include/ImageMagick-7 diff --git a/server/bin/install-ffmpeg.sh b/server/bin/install-ffmpeg.sh index f3547e8d3d..8e60b3b70f 100755 --- a/server/bin/install-ffmpeg.sh +++ b/server/bin/install-ffmpeg.sh @@ -15,3 +15,6 @@ apt-get -yqq -f install ./jellyfin-ffmpeg6_${FFMPEG_VERSION}-bookworm_${TARGETAR rm jellyfin-ffmpeg6_${FFMPEG_VERSION}-bookworm_${TARGETARCH}.deb rm ffmpeg.sha256 ldconfig /usr/lib/jellyfin-ffmpeg/lib + +ln -s /usr/lib/jellyfin-ffmpeg/ffmpeg /usr/bin +ln -s /usr/lib/jellyfin-ffmpeg/ffprobe /usr/bin diff --git a/server/build-lock.json b/server/build-lock.json index 0bd768b14f..2dbdf87369 100644 --- a/server/build-lock.json +++ b/server/build-lock.json @@ -3,7 +3,6 @@ { "name": "imagemagick", "version": "7.1.1-13", - "sha256": "8e3ce1aaad19da9f2ca444072bcc631d193a219e3ee11c13ad6d3c895044142c" }, {