Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
fix docker cp
  • Loading branch information
3nids committed Oct 16, 2019
1 parent 6b28aa8 commit b97436f
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions .ci/travis/docker_image/script.sh
Expand Up @@ -42,14 +42,13 @@ docker build --build-arg DOCKER_TAG="${DOCKER_TAG}" \
-f qgis.dockerfile ..

docker run --name qgis_container qgis/qgis:${DOCKER_TAG} /bin/true
CONTAINER_ID=$(docker ps -aqf "name=qgis_container")

echo "Copy build cache from Docker container to Travis cache directory"
rm -rf "${CCACHE_DIR:?}/"*
docker cp ${CONTAINER_ID}:/usr/src/QGIS/.ccache_image_build ${CCACHE_DIR}
docker cp qgis_container:/usr/src/QGIS/.ccache_image_build ${CCACHE_DIR}
popd

docker cp ${CONTAINER_ID}:/usr/src/build_exit_value ${HOME}/build_exit_value
docker cp qgis_container:/usr/src/build_exit_value ${HOME}/build_exit_value
if [[ $(cat ${HOME}/build_exit_value) -eq 124 ]]; then
echo "Build timeout, not pushing image or triggering PyQGIS docs"
exit 1
Expand Down

0 comments on commit b97436f

Please sign in to comment.