diff --git a/Dockerfile b/Dockerfile index c34a62c..220e0b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,7 +7,7 @@ FROM builder LABEL maintainer="Jay MOULIN " -RUN apt-get update && apt-get install libav-tools -y --force-yes +RUN apt-get update && apt-get install ffmpeg -y --force-yes ADD ./convert.sh /usr/bin/convert.sh diff --git a/Makefile b/Makefile index dd74d6c..f31bd7c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ -VERSION ?= n4.2-dev +VERSION ?= 4.1.3 CACHE ?= --no-cache=1 -FULLVERSION ?= n4.2-dev +FULLVERSION ?= 4.1.3 archs ?= amd64 arm32v5 arm32v7 arm64v8 i386 aarch64 .PHONY: all build publish latest diff --git a/convert.sh b/convert.sh index 3615f13..b5c801f 100755 --- a/convert.sh +++ b/convert.sh @@ -8,11 +8,11 @@ for f in **/*.{avi,ogm,wmv,AVI,OGM,WMV,flv,FLV,mkv,MKV,mov,MOV,m4v,M4V}; do printf '\033[1;34;40m' echo "Converting $f" printf '\033[0m' - avconv -i "$f" -strict experimental -c:v libx264 "${f:0:-4}.mp4" && rm "$f" + ffmpeg -i "$f" -strict experimental -c:v libx264 "${f:0:-4}.mp4" && rm "$f" done for f in **/*.{divx,DIVX,webm,WEBM}; do printf '\033[1;34;40m' echo "Converting $f" printf '\033[0m' - avconv -i "$f" -strict experimental -c:v libx264 "${f:0:-5}.mp4" && rm "$f" + ffmpeg -i "$f" -strict experimental -c:v libx264 "${f:0:-5}.mp4" && rm "$f" done