sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

build Disco Docker image with GCC

Browse Source 
freeze happens with clang when building the bindings
This commit is contained in:
Denis Rouzaud 2019-06-18 16:58:11 +02:00
parent f319235b28
commit 8474a54927
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.ci/travis/docker_image/script.sh
View File

@ -28,6 +28,7 @@ echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \ docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
--cache-from "qgis/qgis:${DOCKER_TAG}" \ --cache-from "qgis/qgis:${DOCKER_TAG}" \
-t "qgis/qgis:${DOCKER_TAG}" \ -t "qgis/qgis:${DOCKER_TAG}" \
--build-arg CC --build-arg CXX \
-f qgis.dockerfile .. -f qgis.dockerfile ..
echo "${bold}Pushing image to docker hub...${endbold}" echo "${bold}Pushing image to docker hub...${endbold}"
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD" docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"

4
.docker/qgis.dockerfile
View File

@ -9,8 +9,8 @@ MAINTAINER Denis Rouzaud <denis@opengis.ch>
LABEL Description="Docker container with QGIS" Vendor="QGIS.org" Version="1.1" LABEL Description="Docker container with QGIS" Vendor="QGIS.org" Version="1.1"
ENV CC=/usr/lib/ccache/clang ARG CC=/usr/lib/ccache/clang
ENV CXX=/usr/lib/ccache/clang++ ARG CXX=/usr/lib/ccache/clang++
ENV QT_SELECT=5 ENV QT_SELECT=5
ENV LANG=C.UTF-8 ENV LANG=C.UTF-8

4
.travis.yml
View File

@ -111,6 +111,8 @@ matrix:
- TRIGGER_PYQGIS_DOC=FALSE - TRIGGER_PYQGIS_DOC=FALSE
- DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' ) - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps.dockerfile
- CC=/usr/lib/ccache/clang
- CXX=/usr/lib/ccache/clang++
########################################################## ##########################################################
# DISCO DOCKER BUILD ON CRON OR TAG # DISCO DOCKER BUILD ON CRON OR TAG
@ -126,6 +128,8 @@ matrix:
- DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_disco" - DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_disco"
- DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-disco.dockerfile - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-disco.dockerfile
- INSTALL_LIBSECCOMP=TRUE - INSTALL_LIBSECCOMP=TRUE
- CC=/usr/lib/ccache/gcc
- CXX=/usr/lib/ccache/g++ # Building SIP binding freezes with Clang in Docker, maybe a SIP issue, maybe not