Private
Public Access
2
0

build config: fix parameter configuration for docker-compose

We were incorrectly using clang all the time, overriding gcc.
This also brings newer version of docker-compose.

Signed-off-by: Nicolas Oliver <dario.n.oliver@intel.com>
Signed-off-by: Alex Tereschenko <alext.mkrs@gmail.com>
This commit is contained in:
Nicolas Oliver
2017-06-06 12:44:26 -03:00
committed by Alex Tereschenko
parent 4109b8b454
commit 000746c20d
2 changed files with 28 additions and 24 deletions

View File

@@ -45,6 +45,12 @@ matrix:
services:
- docker
before_install:
- sudo rm /usr/local/bin/docker-compose
- curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose
- chmod +x docker-compose
- sudo mv docker-compose /usr/local/bin
before_script:
- if [ "$CC" == "gcc" ]; then export CC=gcc-4.8; fi
- if [ "$CXX" == "g++" ]; then export CXX=g++-4.8; fi