Skip to content

Commit

Permalink
use Ubuntu cosmic for base image
Browse files Browse the repository at this point in the history
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 8ea02e9 commit a920a79
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions .ci/travis/linux/docker-build-test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions .docker/qgis3-build-deps.dockerfile
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -34,6 +34,7 @@ RUN apt-get update \
libproj-dev \
libqca-qt5-2-dev \
libqca-qt5-2-plugins \
libqt53dextras5 \
libqt53drender5 \
libqt5concurrent5 \
libqt5opengl5-dev \
Expand Down Expand Up @@ -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 \
Expand Down

0 comments on commit a920a79

Please sign in to comment.