Browse Source

Merge pull request #86 from orchardup/update-to-docker-0.8.0

Test Docker 0.8.0 on Travis
Ben Firshman 12 years ago
parent
commit
b310516ba7
2 changed files with 4 additions and 1 deletions
  1. 3 0
      .travis.yml
  2. 1 1
      script/travis-install

+ 3 - 0
.travis.yml

@@ -4,6 +4,9 @@ python:
 - '2.7'
 - '3.2'
 - '3.3'
+env:
+- DOCKER_VERSION=0.7.6
+- DOCKER_VERSION=0.8.0
 matrix:
   allow_failures:
   - python: '3.2'

+ 1 - 1
script/travis-install

@@ -7,7 +7,7 @@ sudo sh -c "echo deb http://get.docker.io/ubuntu docker main > /etc/apt/sources.
 sudo apt-get update
 echo exit 101 | sudo tee /usr/sbin/policy-rc.d
 sudo chmod +x /usr/sbin/policy-rc.d
-sudo apt-get install -qy slirp lxc lxc-docker-0.7.5
+sudo apt-get install -qy slirp lxc lxc-docker-$DOCKER_VERSION
 git clone git://github.com/jpetazzo/sekexe
 python setup.py install
 pip install -r requirements-dev.txt