commit 34a2a14ba48b12eba652e2781bf4a769650084bb parent d9b4b84faedf93725640785535c3ddcf828745c6 Author: Marcel <MTRNord@users.noreply.github.com> Date: Mon, 3 Oct 2016 21:39:52 +0200 Update Dockerfile Diffstat:
| M | Dockerfile | | | 49 | ++++--------------------------------------------- |
1 file changed, 4 insertions(+), 45 deletions(-)
diff --git a/Dockerfile b/Dockerfile @@ -7,52 +7,11 @@ WORKDIR /usr/src/app # Various Python and C/build deps RUN apt-get update && apt-get install -y \ - build-essential \ - git \ - cmake \ - libgtk2.0-dev \ - pkg-config \ - libavcodec-dev \ - libavformat-dev \ - libswscale-dev \ python-dev \ + libopencv-dev \ python-opencv \ - python-numpy \ - libtbb2 \ - libtbb-dev \ - libjpeg-dev \ - libpng-dev \ - libtiff-dev \ - libjasper-dev \ - libdc1394-22-dev -# # Install Open CV - Warning, this takes absolutely forever -# RUN cd ~ && \ -# git clone https://github.com/opencv/opencv.git && \ -# cd opencv && \ -# git checkout 3.1.0 && \ -# cd ~ && \ -# git clone https://github.com/opencv/opencv_contrib.git && \ -# cd opencv_contrib && \ -# git checkout 3.1.0 && \ -# cd ~/opencv && \ -# mkdir build && \ -# cd build && \ -# cmake \ -# -D CMAKE_BUILD_TYPE=RELEASE \ -# -D CMAKE_INSTALL_PREFIX=/usr/local \ -# -D INSTALL_C_EXAMPLES=OFF \ -# -D BUILD_NEW_PYTHON_SUPPORT=ON \ -# -D INSTALL_PYTHON_EXAMPLES=ON \ -# -D OPENCV_EXTRA_MODULES_PATH=~/opencv_contrib/modules \ -# -D BUILD_EXAMPLES=ON .. && \ -# make -j4 && \ -# make install && \ -# ldconfig && \ -# cd ~ && rm -R opencv_contrib && rm -R opencv -COPY requirements.txt /usr/src/app/ -RUN pip install --no-cache-dir -r requirements.txt -RUN echo 'export PYTHONPATH=/usr/local/lib/python2.7/site-packages' >> ~/.bashrc - -COPY . /usr/src/app +# COPY requirements.txt /usr/src/app/ +# RUN pip install --no-cache-dir -r requirements.txt +# RUN echo 'export PYTHONPATH=/usr/local/lib/python2.7/site-packages' >> ~/.bashrc