baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #200 from vdemeester/some-fixes

Browse source 
Do some build / test-integration fixes
This commit is contained in:
Emile Vauge 2016-02-13 16:33:42 +01:00
commit 786acc961a
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Makefile
View file

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

6
integration/integration_test.go
View file

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

4
webui/Dockerfile
View file

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