Travis: remove docker-compose custom and obsolete install, fix port binding in test

diff --git a/.travis.yml b/.travis.yml
index 0b5d0d9a374c87bf66c2fc142e36438eac989734..c88814cef94d426f6848764823d2b774a48a6ca4 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,28 +7,20 @@ sudo: required
 services:
   - docker
 
-env:
-  global:
-    - DOCKER_COMPOSE_VERSION: 1.5.2
-
 before_install:
-  - docker-compose --version
-  - sudo rm /usr/local/bin/docker-compose
-  - curl -L https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
-  - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
   - docker-compose --version
   - docker version
 
 
 # Install Telemeta
 install:
-  - docker-compose -f docker-compose.yml build
+  - docker-compose pull
+  - docker-compose build
 
 script:
   - docker-compose up -d
   - sleep 60
-  - curl --fail --retry 10 --retry-delay 5  -v http://localhost:8000/
+  - curl --fail --retry 10 --retry-delay 5  -v $(docker-compose port nginx 80)
   - docker-compose stop
 
 after_failure: