From bd23610cec516029de92596ed18397401136d0c5 Mon Sep 17 00:00:00 2001 From: Lee Pepper Date: Mon, 3 Apr 2017 13:22:15 -0600 Subject: [PATCH] Dockerfile updates --- Dockerfile | 148 +++++++++++++++++++++++++---------------------------- 1 file changed, 71 insertions(+), 77 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3e5db229..32ae3183 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,77 +1,71 @@ -#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 -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 -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 rm -rf /code - -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 -# Replace g++ and gcc with our own scripts -# COPY /docker/ /code/docker/ -# RUN mv -v /usr/bin/gcc /usr/bin/gcc_real && mv -v /usr/bin/g++ /usr/bin/g++_real && cp -v /code/docker/gcc /usr/bin/gcc && cp -v /code/docker/g++ /usr/bin/g++ - -#Compile code in SuperBuild and root directories - -RUN cd SuperBuild && mkdir build && cd build && cmake -w .. && make -w -j$(nproc) && cd ../.. && mkdir build && cd build && cmake -w .. && make -w -j$(nproc) - -RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - -# 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"] +