enable dual builds BIONIC/COSMIC for images

.ci/travis/linux/before_script.sh

@@ -36,6 +36,7 @@ echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
 echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
 echo "DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD"
 echo "DOCKER_BUILD_QGIS_IMAGE: $DOCKER_BUILD_QGIS_IMAGE"
+echo "DOCKER_BUILD_DEPS_FILE: $DOCKER_BUILD_DEPS_FILE"
 echo "TRAVIS_TIMESTAMP: $TRAVIS_TIMESTAMP"
 echo "travis_fold:end:travis_env"
 
@@ -49,10 +50,10 @@ if [[ $DOCKER_BUILD_QGIS_IMAGE =~ false ]]; then
 fi
 
 if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
-  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
+  docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
 else
   docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
-  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
+  docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
 fi
 echo "travis_fold:end:docker_build"
 

.docker/qgis3-build-deps-cosmic.dockerfile

@@ -0,0 +1,139 @@
+FROM      ubuntu:18.10
+MAINTAINER Denis Rouzaud <denis@opengis.ch>
+
+LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
+
+# && 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  apt-get update \
+  && apt-get install -y software-properties-common \
+  && apt-get update \
+  && apt-get install -y \
+    apt-transport-https \
+    bison \
+    ca-certificates \
+    ccache \
+    clang \
+    cmake \
+    curl \
+    dh-python \
+    flex \
+    gdal-bin \
+    git \
+    graphviz \
+    grass-dev \
+    libexpat1-dev \
+    libfcgi-dev \
+    libgdal-dev \
+    libgeos-dev \
+    libgsl-dev \
+    libpq-dev \
+    libproj-dev \
+    libqca-qt5-2-dev \
+    libqca-qt5-2-plugins \
+    libqt53dextras5 \
+    libqt53drender5 \
+    libqt5concurrent5 \
+    libqt5opengl5-dev \
+    libqt5positioning5 \
+    libqt5qml5 \
+    libqt5quick5 \
+    libqt5quickcontrols2-5 \
+    libqt5scintilla2-dev \
+    libqt5sql5-odbc \
+    libqt5sql5-sqlite \
+    libqt5svg5-dev \
+    libqt5webkit5-dev \
+    libqt5xml5 \
+    libqt5xmlpatterns5-dev \
+    libqt5serialport5-dev \
+    libqwt-qt5-dev \
+    libspatialindex-dev \
+    libspatialite-dev \
+    libsqlite3-dev \
+    libsqlite3-mod-spatialite \
+    libzip-dev \
+    lighttpd \
+    locales \
+    ninja-build \
+    pkg-config \
+    poppler-utils \
+    postgresql-client \
+    pyqt5-dev \
+    pyqt5-dev-tools \
+    pyqt5.qsci-dev \
+    python3-all-dev \
+    python3-dev \
+    python3-future \
+    python3-gdal \
+    python3-mock \
+    python3-nose2 \
+    python3-pip \
+    python3-psycopg2 \
+    python3-pyqt5 \
+    python3-pyqt5.qsci \
+    python3-pyqt5.qtsql \
+    python3-pyqt5.qtsvg \
+    python3-sip \
+    python3-sip-dev \
+    python3-termcolor \
+    python3-yaml \
+    qt3d5-dev \
+    qt3d-assimpsceneimport-plugin \
+    qt3d-defaultgeometryloader-plugin \
+    qt3d-gltfsceneio-plugin \
+    qt3d-scene2d-plugin \
+    qt5keychain-dev \
+    qtbase5-dev \
+    qtdeclarative5-dev-tools \
+    qtpositioning5-dev \
+    qttools5-dev \
+    qttools5-dev-tools \
+    qtbase5-private-dev \
+    saga \
+    spawn-fcgi \
+    txt2tags \
+    xauth \
+    xfonts-100dpi \
+    xfonts-75dpi \
+    xfonts-base \
+    xfonts-scalable \
+    xvfb \
+  && pip3 install \
+    psycopg2 \
+    numpy \
+    nose2 \
+    pyyaml \
+    mock \
+    future \
+    termcolor \
+    owslib \
+    oauthlib \
+    pyopenssl \
+  && 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
+ENV CXX=/usr/lib/ccache/clang++
+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

.travis.yml

@@ -35,6 +35,7 @@ matrix:
         - TRAVIS_CONFIG=linux
         - DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
         - DOCKER_BUILD_QGIS_IMAGE=false
+        - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
 
       ##########################################################
       # CODE LAYOUT
@@ -96,6 +97,7 @@ matrix:
         - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
         - DOCKER_DEBIAN_DISTRO=bionic
         - DOCKER_BUILD_QGIS_IMAGE=true
+        - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
 
       ##########################################################
       # COSMIC DOCKER BUILD ON CRON OR TAG
@@ -105,9 +107,10 @@ matrix:
       services: docker
       env:
         - TRAVIS_CONFIG=linux
-        - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
+        - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_cosmic
         - DOCKER_DEBIAN_DISTRO=cosmic
         - DOCKER_BUILD_QGIS_IMAGE=true
+        - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-cosmic.dockerfile