From 1dbe29e4fb6f4a9bf6629fb7c77226e8eb376b45 Mon Sep 17 00:00:00 2001
From: David Vasandani <davidvasandani@learnzillion.com>
Date: Tue, 26 Mar 2019 16:21:44 -0700
Subject: [PATCH] formats the Dockerfile for clarity

---
 Dockerfile | 116 ++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 96 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c35ca37..068cdb43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,32 +3,87 @@ FROM phusion/baseimage
 # Env variables
 ENV DEBIAN_FRONTEND noninteractive
 
-#Install dependencies
-RUN apt-get update -y
-RUN apt-get install software-properties-common -y
-#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
+#Install dependencies and required requisites
+RUN apt-get update -y \
+  && apt-get install -y \
+    software-properties-common \
+  && add-apt-repository -y ppa:ubuntugis/ppa \
+  && add-apt-repository -y ppa:george-edison55/cmake-3.x \
+  && 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 libtbb2 libtbb-dev libjpeg-dev libpng-dev libtiff-dev libjasper-dev libflann-dev \
-libproj-dev libxext-dev liblapack-dev libeigen3-dev libvtk6-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 \
-liblas-bin python-matplotlib libatlas-base-dev swig2.0 python-wheel libboost-log-dev libjsoncpp-dev python-gdal
+RUN apt-get install --no-install-recommends -y \
+  build-essential \
+  cmake \
+  gdal-bin \
+  git \
+  libatlas-base-dev \
+  libavcodec-dev \
+  libavformat-dev \
+  libboost-date-time-dev \
+  libboost-filesystem-dev \
+  libboost-iostreams-dev \
+  libboost-log-dev \
+  libboost-python-dev \
+  libboost-regex-dev \
+  libboost-thread-dev \
+  libeigen3-dev \
+  libflann-dev \
+  libgdal-dev \
+  libgeotiff-dev \
+  libgoogle-glog-dev \
+  libgtk2.0-dev \
+  libjasper-dev \
+  libjpeg-dev \
+  libjsoncpp-dev \
+  liblapack-dev \
+  liblas-bin \
+  libpng-dev \
+  libproj-dev \
+  libsuitesparse-dev \
+  libswscale-dev \
+  libtbb2 \
+  libtbb-dev \
+  libtiff-dev \
+  libvtk6-dev \
+  libxext-dev \
+  python-dev \
+  python-empy \
+  python-gdal \
+  python-matplotlib \
+  python-networkx \
+  python-nose \
+  python-pip \
+  python-pyproj \
+  python-pyside \
+  python-software-properties \
+  python-wheel \
+  swig2.0
 
 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 https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip loky shapely scipy numpy==1.15.4 pyproj psutil repoze.lru
+RUN pip install -U \
+  appsettings \
+  catkin-pkg \
+  exifread \
+  gpxpy \
+  loky \
+  numpy==1.15.4 \
+  psutil \
+  pyproj \
+  PyYAML \
+  repoze.lru \
+  scipy \
+  shapely \
+  xmltodict \
+  https://github.com/OpenDroneMap/gippy/archive/numpyfix.zip
 
 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
 
@@ -46,20 +101,41 @@ 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)
 
-#Compile code in SuperBuild and root directories
+RUN apt-get -y remove \
+  git \
+  build-essential \
+  cmake \
+  libgl1-mesa-dri \
+  python-pip
 
-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 libvtk6-dev
 
 # Cleanup APT
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* 
 
 # Clean Superbuild
-
-RUN rm -rf /code/SuperBuild/download /code/SuperBuild/src/opencv /code/SuperBuild/src/pcl /code/SuperBuild/src/pdal /code/SuperBuild/src/opengv /code/SuperBuild/src/mvstexturing /code/SuperBuild/src/ceres /code/SuperBuild/build/opencv  /code/SuperBuild/src/exiv2lib
+RUN rm -rf \
+  /code/SuperBuild/build/opencv \
+  /code/SuperBuild/download \
+  /code/SuperBuild/src/ceres \
+  /code/SuperBuild/src/exiv2lib \
+  /code/SuperBuild/src/mvstexturing \
+  /code/SuperBuild/src/opencv \
+  /code/SuperBuild/src/opengv \
+  /code/SuperBuild/src/pcl \
+  /code/SuperBuild/src/pdal
 
 # Entry point
 ENTRYPOINT ["python", "/code/run.py", "code"]