fix(server): ffprobe not found (immich-app#3532)

* fix(server): ffprobe not found * chore: remove redundant path export * chore: remove empty space
kkeenee · Aug 3, 2023 · a405fba · a405fba
1 parent b5844db
commit a405fba
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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
@@ -3,7 +3,6 @@
     {
       "name": "imagemagick",
       "version": "7.1.1-13",
-
       "sha256": "8e3ce1aaad19da9f2ca444072bcc631d193a219e3ee11c13ad6d3c895044142c"
     },
     {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,6 @@ @@
         {
           "name": "imagemagick",
           "version": "7.1.1-13",
           "sha256": "8e3ce1aaad19da9f2ca444072bcc631d193a219e3ee11c13ad6d3c895044142c"
         },
         {
@@ Expand Down @@