File tree 2 files changed +8
-3
lines changed
2 files changed +8
-3
lines changed Original file line number Diff line number Diff line change @@ -23,7 +23,7 @@ if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
23
23
DIR=$( git rev-parse --show-toplevel) /.docker
24
24
pushd ${DIR}
25
25
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 .
27
27
if [[ $DOCKER_QGIS_IMAGE_PUSH =~ true ]]; then
28
28
echo " ${bold} Pushing image to docker hub...${endbold} "
29
29
docker login -u=" $DOCKER_USERNAME " -p=" $DOCKER_PASSWORD "
Original file line number Diff line number Diff line change 2
2
# CACHE_TAG is provided by Docker cloud
3
3
# see https://docs.docker.com/docker-cloud/builds/advanced/
4
4
# using ARG in FROM requires min v17.05.0-ce
5
- ARG CACHE_TAG=latest
5
+ ARG CACHE_TAG=latest
6
+ ARG CCACHE_DIR
6
7
7
8
FROM qgis/qgis3-build-deps:${CACHE_TAG}
8
9
MAINTAINER Denis Rouzaud <denis.rouzaud@gmail.com>
@@ -12,7 +13,11 @@ ENV CXX=/usr/lib/ccache/clang++
12
13
ENV QT_SELECT=5
13
14
ENV LANG=C.UTF-8
14
15
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
16
21
17
22
WORKDIR /usr/src/QGIS/build
18
23
You can’t perform that action at this time.
0 commit comments