gdal2 in dockerfile

Incorporates dockerfile fix to  #135  proposed by @learning4life

Dockerfile

@@ -3,9 +3,9 @@
 
 FROM ubuntu:16.04
 MAINTAINER Carlo de Franchis <carlodef@gmail.com>
+ARG DEBIAN_FRONTEND=noninteractive # https://goo.gl/aypXVx
 RUN apt-get update && apt-get install -y \
     build-essential \
-    gdal-bin \
     geographiclib-tools \
     git \
     libfftw3-dev \
@@ -14,16 +14,23 @@ RUN apt-get update && apt-get install -y \
     libgeotiff-dev \
     libtiff5-dev \
     python \
-    python-gdal \
     python-numpy \
     python-pip \
     cmake \
-    vim
+    software-properties-common \
+    python-software-properties
 RUN pip install -U pip
 RUN pip install utm bs4 lxml requests
 
-# install s2p
-RUN git clone https://github.com/MISS3D/s2p.git --branch master --single-branch --depth 1 --recursive
-RUN cd s2p && make
+# Install GDAL 2.x from ubuntugis-stable
+RUN apt-get install dialog apt-utils -y
+RUN add-apt-repository ppa:ubuntugis/ppa -y 
+RUN apt-get update && apt-get install -y \
+    gdal-bin \
+    python-gdal
+
+# Install s2p from MISS3D/s2p
+RUN git clone https://github.com/MISS3D/s2p.git --recursive
+RUN cd s2p && make all
 
 WORKDIR /s2p