create CCACHE dir

qgis · Mar 6, 2019 · bda4620 · bda4620
1 parent 68ee39a
commit bda4620
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.ci/travis/docker_image/script.sh b/.ci/travis/docker_image/script.sh
@@ -35,7 +35,7 @@ docker push "qgis/qgis:${DOCKER_TAG}"
 echo "Copy build cache from Docker container to Travis cache directory"
 rm -rf "${CCACHE_DIR:?}/"*
 docker run --name qgis_container qgis/qgis:${DOCKER_TAG} /bin/true
-docker cp qgis_container:/usr/src/QGIS/.ccache_image_build ${CCACHE_DIR}
+docker cp qgis_container:/usr/src/.ccache_image_build ${CCACHE_DIR}
 docker rm qgis_container
 popd
 echo "Trigger build of PyQGIS Documentation"

diff --git a/.docker/qgis.dockerfile b/.docker/qgis.dockerfile
@@ -17,7 +17,8 @@ ENV LANG=C.UTF-8
 COPY . /usr/src/QGIS
 
 # If this directory is changed, also adapt script.sh which copies the directory
-ENV CCACHE_DIR=/usr/src/QGIS/.ccache_image_build
+RUN mkdir -p /usr/src/.ccache_image_build
+ENV CCACHE_DIR=/usr/src/.ccache_image_build
 RUN ccache -M 1G
 RUN ccache -s