From 7f8d2067913b7c91265124a8f174234bb62e50b2 Mon Sep 17 00:00:00 2001
From: Lee Pepper <pepperlk@gmail.com>
Date: Thu, 30 Mar 2017 14:58:51 -0600
Subject: [PATCH] Docker packages.Dockerfile Updates

Moved to phusion/baseimage
Removed .git folder in docker image
Also removed .git from the COPY in Dockerfile
Dropped Test files and git info from Dockerfile
---
 .dockerignore       |  1 +
 Dockerfile          |  8 ++---
 packages.Dockerfile | 82 +++++----------------------------------------
 3 files changed, 12 insertions(+), 79 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 870eb99a..2747018e 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -12,3 +12,4 @@ odm_texturing
 odm_meshing
 odm_georeferencing
 images_resize
+.git
diff --git a/Dockerfile b/Dockerfile
index 8bd0b476..28c922fa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,6 @@ WORKDIR /code
 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/
@@ -20,11 +17,10 @@ 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
+# 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) \
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 <alex.hagiopol@icloud.com>
 
 # 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"