Merge branch 'master' into feature/leitor-a3

.travis.yml

@@ -2,7 +2,7 @@ services:
   - docker
 
 # before_script:
-  - docker-compose build
+  # - docker-compose build
 
 # script:
   # - docker-compose run wscef
@@ -15,9 +15,10 @@ env:
 
 before_script:
   - docker login -u="$DOCKER_USER" -p="$DOCKER_PASS"
-  - export REPO=farrbeiro/wscef-docker
+  - export REPO=farribeiro/wscef-docker
+  - export COMMIT=latest
   - export TAG=`if [ "$TRAVIS_BRANCH" == "master" ]; then echo "latest"; else echo $TRAVIS_BRANCH ; fi`
-  - docker build -f Dockerfile -t $REPO:$COMMIT .
+  - docker-compose build
   - docker tag $REPO:$COMMIT $REPO:$TAG
   - docker tag $REPO:$COMMIT $REPO:travis-$TRAVIS_BUILD_NUMBER
   - docker push $REPO

docker-compose.yml

@@ -1,6 +1,7 @@
 version: '2'
 services:
   wscef:
+    image: farribeiro/wscef-docker
     build: .
     devices:
       - /dev/snd:/dev/snd