Sync with upstream branch 'jwilder/master'
This commit is contained in:
commit
c1a72e02e8
1 changed files with 2 additions and 1 deletions
|
@ -2,7 +2,8 @@ machine:
|
|||
pre:
|
||||
# install docker 1.9.1 with some CircleCI suggestions:
|
||||
# https://discuss.circleci.com/t/how-use-a-different-docker-version/298/8
|
||||
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'; sudo chmod 0755 /usr/bin/docker; true
|
||||
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.1-circleci'
|
||||
- sudo chmod 0755 /usr/bin/docker
|
||||
- sudo sed -i -e 's/ --userland-proxy=false//' /etc/default/docker
|
||||
services:
|
||||
- docker
|
||||
|
|
Loading…
Reference in a new issue