Skip to content
Permalink
Browse files
use Ubuntu cosmic for base image
This will easily allow newer version of Qt but mainly SIP for auto build of the Python API docs.
  • Loading branch information
3nids committed Nov 14, 2018
1 parent 8b9e86d commit 1d3df6ffae99cfddaad5158878efaa065ce20fe7
Showing with 5 additions and 2 deletions.
  1. +3 −0 .ci/travis/linux/docker-build-test.sh
  2. +2 −2 .docker/qgis3-build-deps.dockerfile
@@ -59,6 +59,9 @@ cmake \
-DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
-DWERROR=TRUE \
-DQT5_3DEXTRA_LIBRARY="/usr/lib/x86_64-linux-gnu/libQt53DExtras.so" \
-DQT5_3DEXTRA_INCLUDE_DIR="/root/QGIS/external/qt3dextra-headers" \
-DCMAKE_PREFIX_PATH="/root/QGIS/external/qt3dextra-headers/cmake" \
..
echo "travis_fold:end:cmake"

@@ -1,4 +1,4 @@
FROM ubuntu:18.04
FROM ubuntu:18.10
MAINTAINER Denis Rouzaud <denis@opengis.ch>

LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
@@ -34,6 +34,7 @@ RUN apt-get update \
libproj-dev \
libqca-qt5-2-dev \
libqca-qt5-2-plugins \
libqt53dextras5 \
libqt53drender5 \
libqt5concurrent5 \
libqt5opengl5-dev \
@@ -88,7 +89,6 @@ RUN apt-get update \
qt5keychain-dev \
qtbase5-dev \
qtdeclarative5-dev-tools \
qtdeclarative5-qtquick2-plugin \
qtpositioning5-dev \
qttools5-dev \
qttools5-dev-tools \

0 comments on commit 1d3df6f

Please sign in to comment.