From e3f80d932394050ff8b8a5233d57cf85a3955309 Mon Sep 17 00:00:00 2001 From: Olli-Pekka Heinisuo Date: Thu, 9 Jan 2020 19:45:41 +0200 Subject: [PATCH] update dockerfiles --- docker/Dockerfile_i686 | 4 ++-- docker/Dockerfile_x86_64 | 4 ++-- docker/README.md | 6 ++---- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/docker/Dockerfile_i686 b/docker/Dockerfile_i686 index d5b315a..cffc998 100644 --- a/docker/Dockerfile_i686 +++ b/docker/Dockerfile_i686 @@ -61,8 +61,8 @@ RUN cd ~/ffmpeg_sources && \ rm -rf ~/openssl_build RUN cd ~/ffmpeg_sources && \ - curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \ - tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \ + curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.14.01/nasm-2.14.01.tar.bz2 && \ + tar -xf nasm-2.14.01.tar.bz2 && cd nasm-2.14.01 && ./autogen.sh && \ ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install diff --git a/docker/Dockerfile_x86_64 b/docker/Dockerfile_x86_64 index f7b0b08..c4d47bc 100644 --- a/docker/Dockerfile_x86_64 +++ b/docker/Dockerfile_x86_64 @@ -61,8 +61,8 @@ RUN cd ~/ffmpeg_sources && \ rm -rf ~/openssl_build RUN cd ~/ffmpeg_sources && \ - curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.13.02/nasm-2.13.02.tar.bz2 && \ - tar -xf nasm-2.13.02.tar.bz2 && cd nasm-2.13.02 && ./autogen.sh && \ + curl -O -L http://www.nasm.us/pub/nasm/releasebuilds/2.14.01/nasm-2.14.01.tar.bz2 && \ + tar -xf nasm-2.14.01.tar.bz2 && cd nasm-2.14.01 && ./autogen.sh && \ ./configure --prefix="$HOME/ffmpeg_build" --bindir="$HOME/bin" && \ make -j$(getconf _NPROCESSORS_ONLN) && \ make install diff --git a/docker/README.md b/docker/README.md index e31d7a0..4ac6033 100644 --- a/docker/README.md +++ b/docker/README.md @@ -2,13 +2,11 @@ This folder includes Dockerfiles for extending both ``i686`` and ``x86_64`` manylinux images. -The extended images were created to be able to build OpenCV in reasonable time with Travis. - -These images have been built locally because the process takes over 1,5 hours with modern i7 processor. The images are hosted at https://quay.io/user/skvark. +The extended images were created to be able to build OpenCV in reasonable time with Travis. The images are hosted at https://quay.io/user/skvark. The images have following extra software installed: - Qt 4.8.7 - Cmake 3.9.0 -- FFmpeg with libvpx (latest snapshots at the build time) and recent openssl +- FFmpeg with libvpx (latest snapshots at the build time) and recent openssl + other FFmpeg dependencies built from sources - Some missing headers included from more recent Linux to be able to enable V4L / V4L2 support in OpenCV \ No newline at end of file -- GitLab