MOD new versions

This commit is contained in:
Jan Stabenow
2017-12-12 23:26:29 +01:00
parent e8dbdbb66a
commit 3de09b48ed
2 changed files with 44 additions and 29 deletions

View File

@@ -7,8 +7,8 @@ ENV PKG_CONFIG_PATH=/usr/local/lib/pkgconfig \
ARG FDKAAC_VERSION=0.1.5
ARG LAME_VERSION=3.99.5
ARG X264_VERSION=20170807-2245-stable
ARG FFMPEG_VERSION="2.8.12"
ARG X264_VERSION=20171204-2245-stable
ARG FFMPEG_VERSION=2.8.13
RUN buildDeps="autoconf \
automake \
@@ -31,32 +31,34 @@ RUN buildDeps="autoconf \
export MAKEFLAGS="-j$(($(grep -c ^processor /proc/cpuinfo) + 1))" && \
apk update && \
apk upgrade && \
apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libssl1.0 && \
apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libssl1.0
DIR=$(mktemp -d) && cd ${DIR} && \
curl -sL https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \
RUN DIR=$(mktemp -d) && cd ${DIR} && \
echo "http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2" && \
curl -sL http://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \
tar -jx --strip-components=1 && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-pic --enable-shared --disable-cli && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --enable-shared && \
make && \
make install && \
make install
DIR=$(mktemp -d) && cd ${DIR} && \
RUN DIR=$(mktemp -d) && cd ${DIR} && \
LAME_GIT_VERSION=$(echo ${LAME_VERSION} | tr '.' '_') && \
curl -sL https://github.com/rbrito/lame/archive/RELEASE__${LAME_GIT_VERSION}.tar.gz | \
tar -zx --strip-components=1 && \
cp /usr/share/automake-*/config.guess config.guess && \
./configure --prefix="${SRC}" --bindir="${SRC}/bin" --disable-static --enable-nasm --datarootdir="${DIR}" && \
make && \
make install && \
make install
DIR=$(mktemp -d) && cd ${DIR} && \
RUN DIR=$(mktemp -d) && cd ${DIR} && \
curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \
tar -zx --strip-components=1 && \
autoreconf -fiv && \
./configure --prefix="${SRC}" --disable-static --datadir="${DIR}" && \
make && \
make install && \
DIR=$(mktemp -d) && cd ${DIR} && \
make install
RUN DIR=$(mktemp -d) && cd ${DIR} && \
curl -sLO http://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.gz && \
tar -zx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.gz && \
./configure \
@@ -91,7 +93,7 @@ COPY --from=builder /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg
COPY --from=builder /usr/local/bin/ffprobe /usr/local/bin/ffprobe
COPY --from=builder /usr/local/lib /usr/local/lib
RUN apk add --update libssl1.0 && \
RUN apk add --update --no-cache libssl1.0 && \
ffmpeg -buildconf
CMD ["--help"]

View File

@@ -1,7 +1,7 @@
# FFmpeg
FFmpeg Development Image for H.264-Processing (e.g. RTMP, HLS)
* Alipne Linux (3.6)
* Alpine Linux (3.6)
* FFmpeg
* Docker-Images for AMD64, ARMHF (e.g. Raspberry-Pi) and AARCH64 (e.g. Pine64)
@@ -23,19 +23,20 @@ FFmpeg Development Image for H.264-Processing (e.g. RTMP, HLS)
--disable-static
--disable-ffserver
```
* `3.3.4`, `3.3`, `3` (docker pull `datarhei/ffmpeg:3.3`)
* `3.3.4-armhf`, `3.3-armhf`, `3-armhf` (docker pull `datarhei/ffmpeg:3.3-armhf`)
* `3.3.4-aarch64`, `3.3-aarch64`, `3-aarch64` (docker pull `datarhei/ffmpeg:3.3-aarch64`)
* `3.2.8`, `3.2` (docker pull `datarhei/ffmpeg:3.2`)
* `3.2.8-armhf`, `3.2-armhf` (docker pull `datarhei/ffmpeg:3.2-armhf`)
* `3.2.8-aarch64`, `3.2-aarch64` (docker pull `datarhei/ffmpeg:3.2-aarch64`)
* `3.4.1`, `3.4`, `3` (docker pull `datarhei/ffmpeg:3.4`)
* `3.3.5`, `3.3` (docker pull `datarhei/ffmpeg:3.3`)
* `3.3.5-armhf`, `3.3-armhf`, `3-armhf` (docker pull `datarhei/ffmpeg:3.3-armhf`)
* `3.3.5-aarch64`, `3.3-aarch64`, `3-aarch64` (docker pull `datarhei/ffmpeg:3.3-aarch64`)
* `3.2.9`, `3.2` (docker pull `datarhei/ffmpeg:3.2`)
* `3.2.9-armhf`, `3.2-armhf` (docker pull `datarhei/ffmpeg:3.2-armhf`)
* `3.2.9-aarch64`, `3.2-aarch64` (docker pull `datarhei/ffmpeg:3.2-aarch64`)
* `3.1.11`, `3.1` (docker pull `datarhei/ffmpeg:3.1`)
* `3.1.11-armhf`, `3.1-armhf` (docker pull `datarhei/ffmpeg:3.1-armhf`)
* `3.1.11-aarch64`, `3.1-aarch64` (docker pull `datarhei/ffmpeg:3.1-aarch64`)
* `3.0.9`, `3.0` (docker pull `datarhei/ffmpeg:3.0`)
* `3.0.9-armhf`, `3.0-armhf` (docker pull `datarhei/ffmpeg:3.0-armhf`)
* `3.0.9-aarch64`, `3.0-aarch64` (docker pull `datarhei/ffmpeg:3.0-aarch64`)
* `3.0.10`, `3.0` (docker pull `datarhei/ffmpeg:3.0`)
* `3.0.10-armhf`, `3.0-armhf` (docker pull `datarhei/ffmpeg:3.0-armhf`)
* `3.0.10-aarch64`, `3.0-aarch64` (docker pull `datarhei/ffmpeg:3.0-aarch64`)
* `2.8.13`, `2.8`, `2` (docker pull `datarhei/ffmpeg:2.8`)
* `2.8.13-armhf`, `2.8-armhf`, `2-armhf` (docker pull `datarhei/ffmpeg:2.8-armhf`)
* `2.8.13-aarch64`, `2.8-aarch64`, `2-aarch64` (docker pull `datarhei/ffmpeg:2.8-aarch64`)
@@ -43,12 +44,24 @@ FFmpeg Development Image for H.264-Processing (e.g. RTMP, HLS)
## Build your own Image
```sh
docker build -t ffmpeg \
--build-arg ALPINE_IMAGE=alpine:latest .
docker build -t ffmpeg:amd64 \
--build-arg ALPINE_IMAGE=alpine:latest \
--build-arg FFMPEG_VERSION=3.3.5 \
--build-arg FDKAAC_VERSION=0.1.5 \
--build-arg LAME_VERSION=3.99.5 \
--build-arg X264_VERSION=20171211-2245-stable .
docker build -t ffmpeg:armhf \
--build-arg ALPINE_IMAGE=resin/armhf-alpine:latest .
--build-arg ALPINE_IMAGE=resin/armhf-alpine:latest \
--build-arg FFMPEG_VERSION=3.3.5 \
--build-arg FDKAAC_VERSION=0.1.5 \
--build-arg LAME_VERSION=3.99.5 \
--build-arg X264_VERSION=20171211-2245-stable .
docker build -t ffmpeg:aarch64 \
--build-arg ALPINE_IMAGE=resin/aarch64-alpine:latest .
--build-arg ALPINE_IMAGE=resin/aarch64-alpine:latest \
--build-arg FFMPEG_VERSION=3.3.5 \
--build-arg FDKAAC_VERSION=0.1.5 \
--build-arg LAME_VERSION=3.99.5 \
--build-arg X264_VERSION=20171211-2245-stable .
```