From 1f717426c7be532c4385b9c409de1f6c327e2c11 Mon Sep 17 00:00:00 2001 From: RandomNinjaAtk Date: Tue, 17 Mar 2020 10:22:34 -0400 Subject: [PATCH] Update Dockerfile --- Dockerfile | 55 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/Dockerfile b/Dockerfile index a3cb655..f946318 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,27 +10,6 @@ ENV UPDATE false # Add files from ffmpeg COPY --from=ffmpeg /usr/local/ /usr/local/ -RUN \ - # ffmpeg - echo "**** install runtime ****" && \ - apt-get update && \ - apt-get install -y \ - i965-va-driver \ - libexpat1 \ - libgl1-mesa-dri \ - libglib2.0-0 \ - libgomp1 \ - libharfbuzz0b \ - libv4l-0 \ - libx11-6 \ - libxcb1 \ - libxext6 \ - libxml2 && \ - echo "**** clean up ****" && \ - rm -rf \ - /var/lib/apt/lists/* \ - /var/tmp/* - RUN \ # install dependancies apt-get update -qq && \ @@ -42,12 +21,7 @@ RUN \ jq \ cron && \ apt-get purge --auto-remove -y && \ - apt-get clean && \ - chgrp users /usr/local/bin/ffmpeg && \ - chgrp users /usr/local/bin/ffprobe && \ - chmod g+x /usr/local/bin/ffmpeg && \ - chmod g+x /usr/local/bin/ffprobe - + apt-get clean # get python3 and git, and install python libraries RUN \ @@ -73,6 +47,33 @@ RUN \ cd ${SMA_PATH} && \ pip3 install -r ${SMA_PATH}/setup/requirements.txt +RUN \ + # ffmpeg + chgrp users /usr/local/bin/ffmpeg && \ + chgrp users /usr/local/bin/ffprobe && \ + chmod g+x /usr/local/bin/ffmpeg && \ + chmod g+x /usr/local/bin/ffprobe && \ + echo "**** install runtime ****" && \ + apt-get update && \ + apt-get install -y \ + i965-va-driver \ + libexpat1 \ + libgl1-mesa-dri \ + libglib2.0-0 \ + libgomp1 \ + libharfbuzz0b \ + libv4l-0 \ + libx11-6 \ + libxcb1 \ + libxext6 \ + libxml2 \ + libva-drm2 \ + libva2 && \ + echo "**** clean up ****" && \ + rm -rf \ + /var/lib/apt/lists/* \ + /var/tmp/* + RUN \ # make directory mkdir -p ${SABSCRIPTS_PATH} && \