diff --git a/.dockerignore b/.dockerignore index 870eb99a..e82fb5df 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,14 +1,17 @@ -Dockerfile -tests/test_data -SuperBuild/build -SuperBuild/download -SuperBuild/install -SuperBuild/src -build -opensfm -pmvs -odm_orthophoto -odm_texturing -odm_meshing -odm_georeferencing -images_resize +Dockerfile +tests/test_data +SuperBuild/build +SuperBuild/download +SuperBuild/install +SuperBuild/src +build +opensfm +pmvs +odm_orthophoto +odm_texturing +odm_meshing +odm_georeferencing +images_resize +.git + + diff --git a/Dockerfile b/Dockerfile index 8bd0b476..32ae3183 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,34 +1,71 @@ -#Pull in previously built packages image with lots of libraries. -FROM packages - -# Prepare directories -RUN mkdir /code -WORKDIR /code - -# Copy repository files -COPY ccd_defs_check.py /code/ccd_defs_check.py -COPY CMakeLists.txt /code/CMakeLists.txt -COPY configure.sh /code/configure.sh -COPY /.git/ /code/.git/ -COPY .gitignore /code/.gitignore -COPY .gitmodules /code/.gitmodules -COPY /modules/ /code/modules/ -COPY /opendm/ /code/opendm/ -COPY /patched_files/ /code/patched_files/ -COPY run.py /code/run.py -COPY /scripts/ /code/scripts/ -COPY /SuperBuild/cmake/ /code/SuperBuild/cmake/ -COPY /SuperBuild/CMakeLists.txt /code/SuperBuild/CMakeLists.txt -COPY docker.settings.yaml /code/settings.yaml -COPY /tests/ /code/tests/ -COPY VERSION /code/VERSION - -# Update submodules -RUN git submodule init && git submodule update - -#Compile code in SuperBuild and root directories -RUN cd SuperBuild && mkdir build && cd build && cmake .. && make -j$(nproc) \ - && cd ../.. && mkdir build && cd build && cmake .. && make -j$(nproc) - -# Entry point -ENTRYPOINT ["python", "/code/run.py", "code"] +#Pull in previously built packages image with lots of libraries. +FROM phusion/baseimage + + +# Env variables +ENV DEBIAN_FRONTEND noninteractive + +#Install dependencies +#Required Requisites +RUN add-apt-repository -y ppa:ubuntugis/ppa +RUN add-apt-repository -y ppa:george-edison55/cmake-3.x +RUN apt-get update -y + +# All packages (Will install much faster) +RUN apt-get install --no-install-recommends -y git cmake python-pip build-essential software-properties-common python-software-properties libgdal-dev gdal-bin libgeotiff-dev \ +libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libflann-dev \ +libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk5-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \ +libboost-regex-dev libboost-python-dev libboost-date-time-dev libboost-thread-dev python-pyproj python-empy python-nose python-pyside python-pyexiv2 python-scipy \ +jhead liblas-bin python-matplotlib libatlas-base-dev + +RUN apt-get remove libdc1394-22-dev +RUN pip install --upgrade pip +RUN pip install setuptools +RUN pip install -U PyYAML exifread gpxpy xmltodict catkin-pkg appsettings + +ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages" +ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm" +ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/code/SuperBuild/install/lib" + + +# Prepare directories + +RUN mkdir /code +WORKDIR /code + + + +# Copy repository files +COPY ccd_defs_check.py /code/ccd_defs_check.py +COPY CMakeLists.txt /code/CMakeLists.txt +COPY configure.sh /code/configure.sh +COPY /modules/ /code/modules/ +COPY /opendm/ /code/opendm/ +COPY /patched_files/ /code/patched_files/ +COPY run.py /code/run.py +COPY /scripts/ /code/scripts/ +COPY /SuperBuild/cmake/ /code/SuperBuild/cmake/ +COPY /SuperBuild/CMakeLists.txt /code/SuperBuild/CMakeLists.txt +COPY docker.settings.yaml /code/settings.yaml +COPY VERSION /code/VERSION + +#Compile code in SuperBuild and root directories + +RUN cd SuperBuild && mkdir build && cd build && cmake .. && make -j$(nproc) && cd ../.. && mkdir build && cd build && cmake .. && make -j$(nproc) + + +RUN apt-get -y remove libgl1-mesa-dri git cmake python-pip build-essential +RUN apt-get install -y libvtk5-dev + +# Cleanup APT +RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + +# Clean Superbuild + +RUN rm -rf /code/SuperBuild/download +RUN rm -rf /code/SuperBuild/src/opencv/samples /code/SuperBuild/src/pcl/test /code/SuperBuild/src/pcl/doc /code/SuperBuild/src/pdal/test /code/SuperBuild/src/pdal/doc + + +# Entry point +ENTRYPOINT ["python", "/code/run.py", "code"] + diff --git a/packages.Dockerfile b/packages.Dockerfile index 5048d19a..07cf0f54 100644 --- a/packages.Dockerfile +++ b/packages.Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:14.04 +FROM phusion/baseimage MAINTAINER Alex Hagiopol # Env variables @@ -6,65 +6,19 @@ ENV DEBIAN_FRONTEND noninteractive #Install dependencies #Required Requisites -RUN apt-get update \ - && apt-get install -y -qq \ - build-essential \ - cmake \ - git \ - python-pip \ - pkg-config - -#CMake 3.1 for MVS-Texturing -RUN apt-get install -y software-properties-common python-software-properties +RUN add-apt-repository -y ppa:ubuntugis/ppa RUN add-apt-repository -y ppa:george-edison55/cmake-3.x RUN apt-get update -y -RUN apt-get install -y --only-upgrade cmake -# Install geo-related depends -# Add ubuntugis/ppa -RUN add-apt-repository -y ppa:ubuntugis/ppa -RUN apt-get update +# All packages (Will install much faster) +RUN apt-get install -y build-essential cmake git python-pip pkg-config software-properties-common python-software-properties libgdal-dev gdal-bin libgeotiff-dev \ +libgtk2.0-dev libavcodec-dev libavformat-dev libswscale-dev python-dev python-numpy libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libflann-dev \ +libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk5-dev python-networkx libgoogle-glog-dev libsuitesparse-dev libboost-filesystem-dev libboost-iostreams-dev \ +libboost-regex-dev libboost-python-dev libboost-date-time-dev libboost-thread-dev python-pyproj python-empy python-nose python-pyside python-pyexiv2 python-scipy \ +jhead liblas-bin python-matplotlib libatlas-base-dev -RUN apt-get update \ - && apt-get install -y -qq \ - libgdal-dev \ - gdal-bin \ - libgeotiff-dev - -#Installing OpenCV Dependencies -RUN apt-get install -y -qq libgtk2.0-dev \ - libavcodec-dev \ - libavformat-dev \ - libswscale-dev \ - python-dev \ - python-numpy \ - libtbb2 \ - libtbb-dev \ - libjpeg-dev \ - libpng-dev \ - libtiff-dev \ - libjasper-dev \ - libflann-dev \ - libproj-dev \ - libxext-dev \ - liblapack-dev \ - libeigen3-dev \ - libvtk5-dev - -#Removing libdc1394-22-dev due to python opencv issue RUN apt-get remove libdc1394-22-dev -#Installing OpenSfM Dependencies -RUN apt-get install -y -qq python-networkx \ - libgoogle-glog-dev \ - libsuitesparse-dev \ - libboost-filesystem-dev \ - libboost-iostreams-dev \ - libboost-regex-dev \ - libboost-python-dev \ - libboost-date-time-dev \ - libboost-thread-dev \ - python-pyproj RUN pip install -U PyYAML \ exifread \ gpxpy \ @@ -72,27 +26,9 @@ RUN pip install -U PyYAML \ catkin-pkg \ appsettings -#Installing Ecto Dependencies -RUN apt-get install -y -qq python-empy \ - python-nose \ - python-pyside -#"Installing OpenDroneMap Dependencies" -RUN apt-get install -y python-pyexiv2 \ - python-scipy \ - jhead \ - liblas-bin -y -qq +RUN apt-get clean -y -RUN apt-get install -y python-empy \ - python-nose \ - python-pyside \ - python-pyexiv2 \ - python-scipy \ - jhead \ - liblas-bin \ - python-matplotlib \ - libatlas-base-dev \ - libatlas3gf-base ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/install/lib/python2.7/dist-packages" ENV PYTHONPATH="$PYTHONPATH:/code/SuperBuild/src/opensfm"