Revert "optimize Dockerfile for build deps"

3nids · 3nids · commit 88e6193669fa · 2019-03-07T13:08:49.000+01:00
This reverts commit 9cdf051.
diff --git a/.docker/qgis3-build-deps-cosmic.dockerfile b/.docker/qgis3-build-deps-cosmic.dockerfile
@@ -3,23 +3,15 @@ MAINTAINER Denis Rouzaud <denis@opengis.ch>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
 
-#############
-# Add sources
-#############
 # && 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 \
 
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
 
-##################
-# Install packages
-##################
 RUN  apt-get update \
   && apt-get install -y software-properties-common \
   && apt-get update \
-  && ACCEPT_EULA=Y apt-get install -y \
+  && apt-get install -y \
     apt-transport-https \
     bison \
     ca-certificates \
@@ -121,15 +113,21 @@ RUN  apt-get update \
     owslib \
     oauthlib \
     pyopenssl \
-    msodbcsql17 \
-    mssql-tools
   && apt-get clean
 
+
+# MSSQL: client side
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
+RUN apt-get update
+RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
+
 # Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163
 RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
 RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 RUN locale-gen
 
+
 RUN echo "alias python=python3" >> ~/.bash_aliases
 
 ENV CC=/usr/lib/ccache/clang
@@ -138,3 +136,4 @@ ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 ENV PATH="/usr/local/bin:${PATH}"
 
+CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
diff --git a/.docker/qgis3-build-deps.dockerfile b/.docker/qgis3-build-deps.dockerfile
@@ -3,23 +3,15 @@ MAINTAINER Denis Rouzaud <denis@opengis.ch>
 
 LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.1"
 
-#############
-# Add sources
-#############
 # && 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 \
 
-RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
-RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
 
-##################
-# Install packages
-##################
 RUN  apt-get update \
   && apt-get install -y software-properties-common \
   && apt-get update \
-  && DEBIAN_FRONTEND=noninteractive ACCEPT_EULA=Y \
+  && DEBIAN_FRONTEND=noninteractive \
   apt-get install -y \
     apt-transport-https \
     bison \
@@ -134,15 +126,21 @@ RUN  apt-get update \
     sphinx \
     requests \
     six \
-    msodbcsql17 \
-    mssql-tools
   && apt-get clean
 
+
+# MSSQL: client side
+RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
+RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
+RUN apt-get update
+RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
+
 # Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163
 RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
 RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
 RUN locale-gen
 
+
 RUN echo "alias python=python3" >> ~/.bash_aliases
 
 # OTB: download and install otb packages for QGIS tests
@@ -155,5 +153,4 @@ ENV QT_SELECT=5
 ENV LANG=C.UTF-8
 ENV PATH="/usr/local/bin:${PATH}"
 
-
-
+CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh
