From 7917fb96dc2159f508d5ebf5b2424723a06ed290 Mon Sep 17 00:00:00 2001 From: Koushik Dutta Date: Tue, 28 Feb 2023 19:39:12 -0800 Subject: [PATCH] docker: incude ffmpeg --- docker/Dockerfile.full | 1 + docker/Dockerfile.lite | 5 +++++ docker/Dockerfile.thin | 5 +++++ docker/template/Dockerfile.full.header | 1 + 4 files changed, 12 insertions(+) diff --git a/docker/Dockerfile.full b/docker/Dockerfile.full index 96f0d2733..fe76c6213 100644 --- a/docker/Dockerfile.full +++ b/docker/Dockerfile.full @@ -38,6 +38,7 @@ RUN apt-get -y install \ # ffmpeg RUN apt-get -y install \ ffmpeg +ENV SCRYPTED_FFMPEG_PATH=ffmpeg # gstreamer native https://gstreamer.freedesktop.org/documentation/installing/on-linux.html?gi-language=c#install-gstreamer-on-ubuntu-or-debian RUN apt-get -y install \ diff --git a/docker/Dockerfile.lite b/docker/Dockerfile.lite index 6fdceb3ae..f08496d1d 100644 --- a/docker/Dockerfile.lite +++ b/docker/Dockerfile.lite @@ -20,6 +20,11 @@ RUN apt-get -y install \ libglib2.0-dev \ pkg-config +# ffmpeg +RUN apt-get -y install \ + ffmpeg +ENV SCRYPTED_FFMPEG_PATH=ffmpeg + # python native RUN apt-get -y install \ python3 \ diff --git a/docker/Dockerfile.thin b/docker/Dockerfile.thin index 369b23ade..ace3f56f2 100644 --- a/docker/Dockerfile.thin +++ b/docker/Dockerfile.thin @@ -19,6 +19,11 @@ RUN apt-get -y install \ libglib2.0-dev \ pkg-config +# ffmpeg +RUN apt-get -y install \ + ffmpeg +ENV SCRYPTED_FFMPEG_PATH=ffmpeg + ENV SCRYPTED_DOCKER_SERVE="true" ENV SCRYPTED_CAN_RESTART="true" ENV SCRYPTED_VOLUME="/server/volume" diff --git a/docker/template/Dockerfile.full.header b/docker/template/Dockerfile.full.header index 7fca525fa..445ef9740 100644 --- a/docker/template/Dockerfile.full.header +++ b/docker/template/Dockerfile.full.header @@ -35,6 +35,7 @@ RUN apt-get -y install \ # ffmpeg RUN apt-get -y install \ ffmpeg +ENV SCRYPTED_FFMPEG_PATH=ffmpeg # gstreamer native https://gstreamer.freedesktop.org/documentation/installing/on-linux.html?gi-language=c#install-gstreamer-on-ubuntu-or-debian RUN apt-get -y install \