Merge pull request #191 from PeterDaveHello/refactor-Dockerfile

Refactor Dockerfile
This commit is contained in:
Marko Viitanen 2018-03-18 11:14:57 +02:00 committed by GitHub
commit 0164291688
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -9,7 +9,7 @@
# #
# RESOLUTION=`avconv -i input.avi 2>&1 | grep Stream | grep -oP ', \K[0-9]+x[0-9]+'` # 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 # 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]+'` # 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 # 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,24 +19,25 @@ FROM ubuntu:18.04
MAINTAINER Marko Viitanen <fador@iki.fi> MAINTAINER Marko Viitanen <fador@iki.fi>
# List of needed packages to be able to build kvazaar with autotools # List of needed packages to be able to build kvazaar with autotools
ENV REQUIRED_PACKAGES automake autoconf libtool m4 build-essential git yasm pkgconf 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 ADD . kvazaar
# data in the image. # Run all the commands in one RUN so we don't have any extra history
RUN apt-get update \ # data in the image.
RUN apt-get update \
&& apt-get install -y $REQUIRED_PACKAGES \ && apt-get install -y $REQUIRED_PACKAGES \
&& apt-get clean \ && apt-get clean \
&& git clone --depth=1 git://github.com/ultravideo/kvazaar.git; \ && cd kvazaar \
cd kvazaar; \ && ./autogen.sh \
./autogen.sh; \ && ./configure --disable-shared \
./configure --disable-shared;\ && make\
make;\ && make install \
make install; \ && AUTOINSTALLED_PACKAGES=`apt-mark showauto` \
AUTOINSTALLED_PACKAGES=`apt-mark showauto`; \ && apt-get remove --purge --force-yes -y $REQUIRED_PACKAGES $AUTOINSTALLED_PACKAGES \
apt-get remove --purge --force-yes -y $REQUIRED_PACKAGES $AUTOINSTALLED_PACKAGES; \ && apt-get clean autoclean \
apt-get clean autoclean; \ && apt-get autoremove -y \
apt-get autoremove -y; \ && rm -rf /var/lib/{apt,dpkg,cache,log}/
rm -rf /var/lib/{apt,dpkg,cache,log}/
ENTRYPOINT ["kvazaar"] ENTRYPOINT ["kvazaar"]
CMD ["--help"] CMD ["--help"]