Skip to content

Commit 23047ff

Browse files
committed
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.
1 parent 48d498b commit 23047ff

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

.ci/travis/linux/docker-build-test.sh

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ cmake \
5959
-DPYTHON_TEST_WRAPPER="timeout -sSIGSEGV 55s"\
6060
-DCXX_EXTRA_FLAGS="${CLANG_WARNINGS}" \
6161
-DWERROR=TRUE \
62+
-DQT5_3DEXTRA_LIBRARY="/usr/lib/x86_64-linux-gnu/libQt53DExtras.so" \
63+
-DQT5_3DEXTRA_INCLUDE_DIR="/root/QGIS/external/qt3dextra-headers" \
64+
-DCMAKE_PREFIX_PATH="/root/QGIS/external/qt3dextra-headers/cmake" \
6265
..
6366
echo "travis_fold:end:cmake"
6467

.docker/qgis3-build-deps.dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ubuntu:18.04
1+
FROM ubuntu:18.10
22
MAINTAINER Denis Rouzaud <denis@opengis.ch>
33

44
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
@@ -35,6 +35,7 @@ RUN apt-get update \
3535
libproj-dev \
3636
libqca-qt5-2-dev \
3737
libqca-qt5-2-plugins \
38+
libqt53dextras5 \
3839
libqt53drender5 \
3940
libqt5concurrent5 \
4041
libqt5opengl5-dev \
@@ -89,7 +90,6 @@ RUN apt-get update \
8990
qt5keychain-dev \
9091
qtbase5-dev \
9192
qtdeclarative5-dev-tools \
92-
qtdeclarative5-qtquick2-plugin \
9393
qtpositioning5-dev \
9494
qttools5-dev \
9595
qttools5-dev-tools \

0 commit comments

Comments
 (0)