Skip to content

Commit cb00a2a

Browse files
3nids3nids
committedNov 16, 2018
enable dual builds BIONIC/COSMIC for images
·
ltr-3_40final-3_6_0
1 parent 51e7672 commit cb00a2a

File tree

3 files changed

+146
-3
lines changed

3 files changed

+146
-3
lines changed
 

‎.ci/travis/linux/before_script.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ echo "TRAVIS_COMMIT_MESSAGE: $TRAVIS_COMMIT_MESSAGE"
3636
echo "DOCKER_DEPS_PUSH: $DOCKER_DEPS_PUSH"
3737
echo "DOCKER_DEPS_IMAGE_REBUILD: $DOCKER_DEPS_IMAGE_REBUILD"
3838
echo "DOCKER_BUILD_QGIS_IMAGE: $DOCKER_BUILD_QGIS_IMAGE"
39+
echo "DOCKER_BUILD_DEPS_FILE: $DOCKER_BUILD_DEPS_FILE"
3940
echo "TRAVIS_TIMESTAMP: $TRAVIS_TIMESTAMP"
4041
echo "travis_fold:end:travis_env"
4142

@@ -49,10 +50,10 @@ if [[ $DOCKER_BUILD_QGIS_IMAGE =~ false ]]; then
4950
fi
5051

5152
if [[ $DOCKER_DEPS_IMAGE_REBUILD =~ true ]]; then
52-
docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
53+
docker build --no-cache -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
5354
else
5455
docker pull "qgis/qgis3-build-deps:${DOCKER_TAG}" || true
55-
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f qgis3-build-deps.dockerfile .
56+
docker build --cache-from "qgis/qgis3-build-deps:${DOCKER_TAG}" -t "qgis/qgis3-build-deps:${DOCKER_TAG}" -f ${DOCKER_BUILD_DEPS_FILE} .
5657
fi
5758
echo "travis_fold:end:docker_build"
5859

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

Lines changed: 139 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,139 @@
1+
FROM ubuntu:18.10
2+
MAINTAINER Denis Rouzaud <denis@opengis.ch>
3+
4+
LABEL Description="Docker container with QGIS dependencies" Vendor="QGIS.org" Version="1.0"
5+
6+
# && echo "deb http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
7+
# && echo "deb-src http://ppa.launchpad.net/ubuntugis/ubuntugis-unstable/ubuntu xenial main" >> /etc/apt/sources.list \
8+
# && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 314DF160 \
9+
10+
11+
RUN apt-get update \
12+
&& apt-get install -y software-properties-common \
13+
&& apt-get update \
14+
&& apt-get install -y \
15+
apt-transport-https \
16+
bison \
17+
ca-certificates \
18+
ccache \
19+
clang \
20+
cmake \
21+
curl \
22+
dh-python \
23+
flex \
24+
gdal-bin \
25+
git \
26+
graphviz \
27+
grass-dev \
28+
libexpat1-dev \
29+
libfcgi-dev \
30+
libgdal-dev \
31+
libgeos-dev \
32+
libgsl-dev \
33+
libpq-dev \
34+
libproj-dev \
35+
libqca-qt5-2-dev \
36+
libqca-qt5-2-plugins \
37+
libqt53dextras5 \
38+
libqt53drender5 \
39+
libqt5concurrent5 \
40+
libqt5opengl5-dev \
41+
libqt5positioning5 \
42+
libqt5qml5 \
43+
libqt5quick5 \
44+
libqt5quickcontrols2-5 \
45+
libqt5scintilla2-dev \
46+
libqt5sql5-odbc \
47+
libqt5sql5-sqlite \
48+
libqt5svg5-dev \
49+
libqt5webkit5-dev \
50+
libqt5xml5 \
51+
libqt5xmlpatterns5-dev \
52+
libqt5serialport5-dev \
53+
libqwt-qt5-dev \
54+
libspatialindex-dev \
55+
libspatialite-dev \
56+
libsqlite3-dev \
57+
libsqlite3-mod-spatialite \
58+
libzip-dev \
59+
lighttpd \
60+
locales \
61+
ninja-build \
62+
pkg-config \
63+
poppler-utils \
64+
postgresql-client \
65+
pyqt5-dev \
66+
pyqt5-dev-tools \
67+
pyqt5.qsci-dev \
68+
python3-all-dev \
69+
python3-dev \
70+
python3-future \
71+
python3-gdal \
72+
python3-mock \
73+
python3-nose2 \
74+
python3-pip \
75+
python3-psycopg2 \
76+
python3-pyqt5 \
77+
python3-pyqt5.qsci \
78+
python3-pyqt5.qtsql \
79+
python3-pyqt5.qtsvg \
80+
python3-sip \
81+
python3-sip-dev \
82+
python3-termcolor \
83+
python3-yaml \
84+
qt3d5-dev \
85+
qt3d-assimpsceneimport-plugin \
86+
qt3d-defaultgeometryloader-plugin \
87+
qt3d-gltfsceneio-plugin \
88+
qt3d-scene2d-plugin \
89+
qt5keychain-dev \
90+
qtbase5-dev \
91+
qtdeclarative5-dev-tools \
92+
qtpositioning5-dev \
93+
qttools5-dev \
94+
qttools5-dev-tools \
95+
qtbase5-private-dev \
96+
saga \
97+
spawn-fcgi \
98+
txt2tags \
99+
xauth \
100+
xfonts-100dpi \
101+
xfonts-75dpi \
102+
xfonts-base \
103+
xfonts-scalable \
104+
xvfb \
105+
&& pip3 install \
106+
psycopg2 \
107+
numpy \
108+
nose2 \
109+
pyyaml \
110+
mock \
111+
future \
112+
termcolor \
113+
owslib \
114+
oauthlib \
115+
pyopenssl \
116+
&& apt-get clean
117+
118+
119+
# MSSQL: client side
120+
RUN curl https://packages.microsoft.com/keys/microsoft.asc | apt-key add -
121+
RUN curl https://packages.microsoft.com/config/ubuntu/16.04/prod.list | tee /etc/apt/sources.list.d/msprod.list
122+
RUN apt-get update
123+
RUN ACCEPT_EULA=Y apt-get install -y msodbcsql17 mssql-tools
124+
125+
# Avoid sqlcmd termination due to locale -- see https://github.com/Microsoft/mssql-docker/issues/163
126+
RUN echo "nb_NO.UTF-8 UTF-8" > /etc/locale.gen
127+
RUN echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
128+
RUN locale-gen
129+
130+
131+
RUN echo "alias python=python3" >> ~/.bash_aliases
132+
133+
ENV CC=/usr/lib/ccache/clang
134+
ENV CXX=/usr/lib/ccache/clang++
135+
ENV QT_SELECT=5
136+
ENV LANG=C.UTF-8
137+
ENV PATH="/usr/local/bin:${PATH}"
138+
139+
CMD /root/QGIS/.ci/travis/linux/docker-build-test.sh

‎.travis.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ matrix:
3535
- TRAVIS_CONFIG=linux
3636
- DOCKER_TAG=$( [[ $TRAVIS_REPO_SLUG =~ qgis/QGIS ]] && echo $TRAVIS_BRANCH | sed 's/master/latest/' || echo "latest" )
3737
- DOCKER_BUILD_QGIS_IMAGE=false
38+
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
3839

3940
##########################################################
4041
# CODE LAYOUT
@@ -96,6 +97,7 @@ matrix:
9697
- DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
9798
- DOCKER_DEBIAN_DISTRO=bionic
9899
- DOCKER_BUILD_QGIS_IMAGE=true
100+
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
99101

100102
##########################################################
101103
# COSMIC DOCKER BUILD ON CRON OR TAG
@@ -105,9 +107,10 @@ matrix:
105107
services: docker
106108
env:
107109
- TRAVIS_CONFIG=linux
108-
- DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
110+
- DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_cosmic
109111
- DOCKER_DEBIAN_DISTRO=cosmic
110112
- DOCKER_BUILD_QGIS_IMAGE=true
113+
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-cosmic.dockerfile
111114

112115

113116

0 commit comments

Comments
 (0)
Please sign in to comment.