From 2e3d7b92e39b3e9602462ef0282b48a2b017f7ba Mon Sep 17 00:00:00 2001 From: Johannes Schickling Date: Thu, 27 Nov 2014 18:01:27 +0100 Subject: [PATCH] opencv --- opencv/{ => 2}/Dockerfile | 2 ++ opencv/3/Dockerfile | 11 +++++++++++ opencv/install.sh | 1 - 3 files changed, 13 insertions(+), 1 deletion(-) rename opencv/{ => 2}/Dockerfile (87%) create mode 100644 opencv/3/Dockerfile diff --git a/opencv/Dockerfile b/opencv/2/Dockerfile similarity index 87% rename from opencv/Dockerfile rename to opencv/2/Dockerfile index 6b414be..8f30460 100644 --- a/opencv/Dockerfile +++ b/opencv/2/Dockerfile @@ -1,6 +1,8 @@ FROM debian:wheezy MAINTAINER Johannes Schickling "schickling.j@gmail.com" +ENV opencv_version "2.4.10.1" + ADD install.sh install.sh RUN chmod +x install.sh && ./install.sh && rm install.sh diff --git a/opencv/3/Dockerfile b/opencv/3/Dockerfile new file mode 100644 index 0000000..c09d9d1 --- /dev/null +++ b/opencv/3/Dockerfile @@ -0,0 +1,11 @@ +FROM debian:wheezy +MAINTAINER Johannes Schickling "schickling.j@gmail.com" + +ENV opencv_version "3.0.0-beta" + +ADD install.sh install.sh +RUN chmod +x install.sh && ./install.sh && rm install.sh + +VOLUME ["/source"] +WORKDIR /source +CMD ["bash"] diff --git a/opencv/install.sh b/opencv/install.sh index 34a3b50..b4c9a95 100644 --- a/opencv/install.sh +++ b/opencv/install.sh @@ -3,7 +3,6 @@ # exit if a command fails set -e -opencv_version="3.0.0-beta" opencv_deps=(libopencv-dev yasm libtiff4-dev libjpeg-dev libjasper-dev libavcodec-dev libavformat-dev libswscale-dev libdc1394-22-dev libxine-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev libv4l-dev python-dev python-numpy libtbb-dev libqt4-dev libgtk2.0-dev libmp3lame-dev libopencore-amrnb-dev libopencore-amrwb-dev libtheora-dev libvorbis-dev libxvidcore-dev x264 v4l-utils ffmpeg pkg-config) install_deps=(curl build-essential checkinstall cmake)