Merge pull request #200 from vdemeester/some-fixes

Do some build / test-integration fixes

Makefile

@@ -24,13 +24,13 @@ print-%: ; @echo $*=$($*)
 
 default: binary
 
-all: build-webui build
+all: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh
 
-binary: build-webui generate-webui build
+binary: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate binary
 
-crossbinary: build-webui generate-webui build
+crossbinary: generate-webui build
 	$(DOCKER_RUN_TRAEFIK) ./script/make.sh generate crossbinary
 
 test: build
@@ -77,10 +77,12 @@ run-dev:
 	go build
 	./traefik
 
-generate-webui:
-	mkdir -p static
-	docker run --rm -v "$$PWD/static":'/src/static' traefik-webui gulp
-	echo 'For more informations show `webui/readme.md`' > $$PWD/static/DONT-EDIT-FILES-IN-THIS-DIRECTORY.md
+generate-webui: build-webui
+	if [ ! -d "static" ]; then \
+		mkdir -p static; \
+		docker run --rm -v "$$PWD/static":'/src/static' traefik-webui gulp; \
+		echo 'For more informations show `webui/readme.md`' > $$PWD/static/DONT-EDIT-FILES-IN-THIS-DIRECTORY.md; \
+	fi
 
 lint:
 	$(foreach file,$(SRCS),golint $(file) || exit;)

integration/integration_test.go

@@ -87,6 +87,9 @@ func (s *BaseSuite) createComposeProject(c *check.C, name string) {
 	c.Assert(err, checker.IsNil)
 	s.composeProject = composeProject
 
+	err = composeProject.Create()
+	c.Assert(err, checker.IsNil)
+
 	s.started = make(chan bool)
 	s.stopped = make(chan bool)
 	s.deleted = make(chan bool)
@@ -96,7 +99,8 @@ func (s *BaseSuite) createComposeProject(c *check.C, name string) {
 
 	composeProject.AddListener(s.listenChan)
 
-	composeProject.Start()
+	err = composeProject.Start()
+	c.Assert(err, checker.IsNil)
 
 	// Wait for compose to start
 	<-s.started

webui/Dockerfile

@@ -11,8 +11,8 @@ COPY bower.json $WEBUI_DIR/
 
 WORKDIR $WEBUI_DIR
 RUN npm set progress=false
-RUN npm install
-RUN bower install --allow-root
+RUN npm install --quiet
+RUN bower install --allow-root --quiet
 
 COPY . $WEBUI_DIR/