From 960ea5144bf3d71c6a5a600a08fc4fd436ad29af Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Sun, 18 Mar 2018 14:13:50 +0800 Subject: [PATCH] Fix Dockerfile indentation --- Dockerfile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 08131d06..f6e27e8b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -9,7 +9,7 @@ # # RESOLUTION=`avconv -i input.avi 2>&1 | grep Stream | grep -oP ', \K[0-9]+x[0-9]+'` # avconv -i input.avi -an -f rawvideo -pix_fmt yuv420p - | docker run -i -a STDIN -a STDOUT kvazaar -i - --wpp --threads=8 --input-res=$RESOLUTION --preset=ultrafast -o - > output.265 -# or +# or # RESOLUTION=`ffmpeg -i input.avi 2>&1 | grep Stream | grep -oP ', \K[0-9]+x[0-9]+'` # ffmpeg -i input.avi -an -f rawvideo -pix_fmt yuv420p - | docker run -i -a STDIN -a STDOUT kvazaar -i - --wpp --threads=8 --input-res=$RESOLUTION --preset=ultrafast -o - > output.265 # @@ -19,12 +19,12 @@ FROM ubuntu:15.10 MAINTAINER Marko Viitanen - # List of needed packages to be able to build kvazaar with autotools - ENV REQUIRED_PACKAGES automake autoconf libtool m4 build-essential git yasm pkgconf - - # Run all the commands in one RUN so we don't have any extra history - # data in the image. - RUN apt-get update \ +# List of needed packages to be able to build kvazaar with autotools +ENV REQUIRED_PACKAGES automake autoconf libtool m4 build-essential git yasm pkgconf + +# Run all the commands in one RUN so we don't have any extra history +# data in the image. +RUN apt-get update \ && apt-get install -y $REQUIRED_PACKAGES \ && apt-get clean \ && git clone --depth=1 git://github.com/ultravideo/kvazaar.git \ @@ -38,5 +38,6 @@ MAINTAINER Marko Viitanen && apt-get clean autoclean \ && apt-get autoremove -y \ && rm -rf /var/lib/{apt,dpkg,cache,log}/ + ENTRYPOINT ["kvazaar"] CMD ["--help"]