github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

use docker 1.9.0 on circleci

Browse Source
This commit is contained in:
Michael Hobbs
2016-01-05 11:29:59 -08:00
parent fec6db13fb
commit 39bba0b36e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
circle.yml
View File

@@ -1,7 +1,7 @@
machine: machine:
pre: pre:
- echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker - echo 'DOCKER_OPTS="-s btrfs -e lxc -D --userland-proxy=false"' | sudo tee -a /etc/default/docker
- sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.8.2-circleci-cp-workaround' - sudo curl -L -o /usr/bin/docker 'https://s3-external-1.amazonaws.com/circle-downloads/docker-1.9.0-circleci'
- sudo chmod 0755 /usr/bin/docker - sudo chmod 0755 /usr/bin/docker
services: services:
- docker - docker

1
tests/ci/parallel_runner.sh
View File

@@ -19,6 +19,7 @@ setup_circle() {
sudo -E CI=true make -e install sudo -E CI=true make -e install
sudo -E make -e setup-deploy-tests sudo -E make -e setup-deploy-tests
make -e ci-dependencies make -e ci-dependencies
docker version
} }
if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then if [[ -n "$CIRCLE_NODE_INDEX" ]] && [[ "$MODE" == "setup" ]]; then