Merge lp:~facundo/magicicada-client/fix-travis into lp:magicicada-client

[Facundo Batista]

- Small Makefile fix for docker rule, in order to fix travis.

Adapt a little Makefile for docker in order to fix travis.

Proof: https://travis-ci.org/chicharreros/magicicada-client/builds/357960309

[Natalia Bidart (nataliabidart)]

Thanks!

review: Approve

=== modified file '.travis.yml'
--- .travis.yml	2018-03-14 21:55:27 +0000
+++ .travis.yml	2018-03-25 11:15:24 +0000
@@ -10,4 +10,4 @@
     - docker build -t magicicada-client-test-run .
 
 script:
-    - docker run magicicada-client-test-run make test
+    - docker run magicicada-client-test-run make venv build test
 
=== modified file 'Makefile'
--- Makefile	2018-03-18 11:59:08 +0000
+++ Makefile	2018-03-25 11:15:24 +0000
@@ -44,9 +44,11 @@
 update-protocol:
 	cd $(PROTOCOL_DIR) && bzr pull && python setup.py build
 
-bootstrap: deps $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol venv
+build:
 	$(ENV)/bin/python setup.py build
 
+bootstrap: deps $(PROTOCOL_DIR) $(PROTOCOL_LINK) update-protocol venv build
+
 docker-bootstrap: clean
 	cat dependencies.txt | xargs apt-get install -y --no-install-recommends
 	cat dependencies-devel.txt | xargs apt-get install -y --no-install-recommends