diff --git a/opencv/2/install.sh b/opencv/2/install.sh deleted file mode 120000 index 61e71e2..0000000 --- a/opencv/2/install.sh +++ /dev/null @@ -1 +0,0 @@ -install.sh \ No newline at end of file diff --git a/opencv/3/Dockerfile b/opencv/3/Dockerfile deleted file mode 100644 index c09d9d1..0000000 --- a/opencv/3/Dockerfile +++ /dev/null @@ -1,11 +0,0 @@ -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/3/install.sh b/opencv/3/install.sh deleted file mode 120000 index 61e71e2..0000000 --- a/opencv/3/install.sh +++ /dev/null @@ -1 +0,0 @@ -install.sh \ No newline at end of file diff --git a/opencv/2/Dockerfile b/opencv/Dockerfile similarity index 87% rename from opencv/2/Dockerfile rename to opencv/Dockerfile index 8f30460..6b414be 100644 --- a/opencv/2/Dockerfile +++ b/opencv/Dockerfile @@ -1,8 +1,6 @@ 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/install.sh b/opencv/install.sh index b4c9a95..470edf2 100644 --- a/opencv/install.sh +++ b/opencv/install.sh @@ -3,6 +3,7 @@ # exit if a command fails set -e +opencv_version="2.4.10.1" 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)