docker: fix ffmpeg path

koush · Jun 11, 2023 · 0cff8ad · 0cff8ad
1 parent 0269959
commit 0cff8ad
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/install/docker/Dockerfile.full b/install/docker/Dockerfile.full
@@ -121,7 +121,9 @@ ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"
 ENV SCRYPTED_INSTALL_PATH="/server"
-ENV SCRYPTED_FFMPEG_PATH="ffmpeg"
+
+RUN test -f "/usr/bin/ffmpeg"
+ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.

diff --git a/install/docker/Dockerfile.lite b/install/docker/Dockerfile.lite
@@ -37,7 +37,9 @@ ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"
 ENV SCRYPTED_INSTALL_PATH="/server"
-ENV SCRYPTED_FFMPEG_PATH="ffmpeg"
+
+RUN test -f "/usr/bin/ffmpeg"
+ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.

diff --git a/install/docker/Dockerfile.thin b/install/docker/Dockerfile.thin
@@ -15,7 +15,9 @@ ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"
 ENV SCRYPTED_INSTALL_PATH="/server"
-ENV SCRYPTED_FFMPEG_PATH="ffmpeg"
+
+RUN test -f "/usr/bin/ffmpeg"
+ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.

diff --git a/install/docker/template/Dockerfile.full.footer b/install/docker/template/Dockerfile.full.footer
@@ -19,7 +19,9 @@ ENV SCRYPTED_INSTALL_ENVIRONMENT="docker"
 ENV SCRYPTED_CAN_RESTART="true"
 ENV SCRYPTED_VOLUME="/server/volume"
 ENV SCRYPTED_INSTALL_PATH="/server"
-ENV SCRYPTED_FFMPEG_PATH="ffmpeg"
+
+RUN test -f "/usr/bin/ffmpeg"
+ENV SCRYPTED_FFMPEG_PATH="/usr/bin/ffmpeg"
 
 # changing this forces pip and npm to perform reinstalls.
 # if this base image changes, this version must be updated.