Skip to content

Commit

Permalink
fix broken build on osx because of docker-compose bug
Browse files Browse the repository at this point in the history
  • Loading branch information
toch committed Dec 19, 2015
1 parent d399ba8 commit 54e1e21
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,19 @@ before_install:
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update; fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update; fi
install:
- sudo sh -c "curl -L https://github.com/docker/compose/releases/download/1.3.3/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose"
- sudo chmod +x /usr/local/bin/docker-compose
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then
sudo sh -c "curl -L https://github.com/docker/compose/releases/download/1.5.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose";
sudo chmod +x /usr/local/bin/docker-compose;
fi
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
brew install docker;
brew install boot2docker;
sudo pip install -U docker-compose;
fi
script:
- if [ "$TRAVIS_OS_NAME" = "osx" ]; then
boot2docker init;
boot2docker up;
fi
- docker-compose run test
- rake local:test_bin_on_current_target

0 comments on commit 54e1e21

Please sign in to comment.