build Disco Docker image with GCC

freeze happens with clang when building the bindings
qgis · Jun 18, 2019 · 8474a54 · 8474a54
1 parent f319235
commit 8474a54
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/.ci/travis/docker_image/script.sh b/.ci/travis/docker_image/script.sh
@@ -28,6 +28,7 @@ echo "${bold}Building QGIS Docker image '${DOCKER_TAG}'...${endbold}"
 docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
              --cache-from "qgis/qgis:${DOCKER_TAG}" \
              -t "qgis/qgis:${DOCKER_TAG}" \
+             --build-arg CC --build-arg CXX \
              -f qgis.dockerfile ..
 echo "${bold}Pushing image to docker hub...${endbold}"
 docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"

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

diff --git a/.travis.yml b/.travis.yml
@@ -111,6 +111,8 @@ matrix:
         - TRIGGER_PYQGIS_DOC=FALSE
         - DOCKER_TAG=$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )
         - 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
@@ -126,6 +128,8 @@ matrix:
         - DOCKER_TAG="$( echo $TRAVIS_BRANCH | sed 's/master/latest/' )_disco"
         - DOCKER_BUILD_DEPS_FILE=qgis3-build-deps-disco.dockerfile
         - 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