Merge pull request #405 from jagerman/retry-apt-get

apt-get tweaks for the docker/debian builds
This commit is contained in:
Wenzel Jakob 2016-09-10 13:46:57 +09:00 committed by GitHub
commit 8d38ebed91

View File

@ -68,8 +68,7 @@ before_install:
--env="CC=$CC" --env="CXX=$CXX" --env="DEBIAN_FRONTEND=$DEBIAN_FRONTEND" \ --env="CC=$CC" --env="CXX=$CXX" --env="DEBIAN_FRONTEND=$DEBIAN_FRONTEND" \
--env=GCC_COLORS=\ \ --env=GCC_COLORS=\ \
$DOCKER) $DOCKER)
docker exec --tty "$containerid" apt-get update docker exec --tty "$containerid" sh -c 'for s in 0 15; do sleep $s; apt-get update && apt-get -qy dist-upgrade && break; done'
docker exec --tty "$containerid" apt-get -y upgrade
export SCRIPT_RUN_PREFIX="docker exec --tty $containerid" export SCRIPT_RUN_PREFIX="docker exec --tty $containerid"
else else
if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ "$TRAVIS_OS_NAME" = "linux" ]; then
@ -91,9 +90,9 @@ install:
- | - |
# Install dependencies # Install dependencies
if [ -n "$DOCKER" ]; then if [ -n "$DOCKER" ]; then
docker exec --tty "$containerid" apt-get -y --no-install-recommends install \ docker exec --tty "$containerid" sh -c "for s in 0 15; do sleep \$s; apt-get -qy --no-install-recommends install \
python$PYTHON-dev python$PY-pytest python$PY-scipy \ python$PYTHON-dev python$PY-pytest python$PY-scipy \
libeigen3-dev cmake make g++ libeigen3-dev cmake make g++ && break; done"
else else
pip install numpy scipy pytest pip install numpy scipy pytest