Skip to content

Commit 720de72

Browse files
committed
set ccache
1 parent c32a8d1 commit 720de72

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

.ci/travis/linux/script.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
2323
DIR=$(git rev-parse --show-toplevel)/.docker
2424
pushd ${DIR}
2525
echo "${bold}Building QGIS Docker image...${endbold}"
26-
docker build -v /root/QGIS:/root/QGIS --cache-from "qgis/qgis:${DOCKER_TAG}" -t "qgis/qgis:${DOCKER_TAG}" -f qgis.dockerfile .
26+
docker build --build-arg CACHE_DIR=/root/.ccache --cache-from "qgis/qgis:${DOCKER_TAG}" -t "qgis/qgis:${DOCKER_TAG}" -f qgis.dockerfile .
2727
if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
2828
echo "${bold}Pushing image to docker hub...${endbold}"
2929
docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"

.docker/qgis.dockerfile

+7-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22
# CACHE_TAG is provided by Docker cloud
33
# see https://docs.docker.com/docker-cloud/builds/advanced/
44
# using ARG in FROM requires min v17.05.0-ce
5-
ARG CACHE_TAG=latest
5+
ARG CACHE_TAG=latest
6+
ARG CCACHE_DIR
67

78
FROM qgis/qgis3-build-deps:${CACHE_TAG}
89
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
@@ -12,7 +13,11 @@ ENV CXX=/usr/lib/ccache/clang++
1213
ENV QT_SELECT=5
1314
ENV LANG=C.UTF-8
1415

15-
COPY . /usr/src/QGIS
16+
COPY .. /usr/src/QGIS
17+
18+
COPY $CACHE_DIR /root/.ccache
19+
ENV CCACHE_DIR=/root/.ccache
20+
RUN ccache -M 1G
1621

1722
WORKDIR /usr/src/QGIS/build
1823

0 commit comments

Comments
 (0)