use coming Ubuntu Bionic 18.04 as base Docker image

3nids · 3nids · commit 28abbef96071 · 2018-02-27T13:43:59.000-04:00
diff --git a/.docker/Dockerfile b/.docker/Dockerfile
@@ -1,11 +1,13 @@
-FROM      ubuntu:16.04
+FROM      ubuntu:18.04
 MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
 
 RUN  apt-get update \
   && apt-get install -y software-properties-common \
-  && add-apt-repository ppa:ubuntugis/ubuntugis-unstable \
+  && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
+  && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
+  && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
   && apt-get update \
   && apt-get install -y \
     bison \
@@ -90,12 +92,7 @@ RUN  apt-get update \
   && apt-get clean \
   && curl -s -S -O https://cmake.org/files/v3.10/cmake-3.10.2-Linux-x86_64.tar.gz \
   && tar --strip-components=1 -zx -f cmake-3.10.2-Linux-x86_64.tar.gz -C /usr/local \
-  && rm cmake-3.10.2-Linux-x86_64.tar.gz \
-  && mkdir /root/sip \
-  && curl -s -S -O -L https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.7/sip-4.19.7.tar.gz \
-  && tar --strip-components=1 -zx -f sip-4.19.7.tar.gz -C /root/sip \
-  && python3 /root/sip/configure.py && make && make install \
-  && rm sip-4.19.7.tar.gz
+  && rm cmake-3.10.2-Linux-x86_64.tar.gz
 
 RUN echo "alias python=python3" >> ~/.bash_aliases
 
