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

Merge branch 'master' into yet-another-refactoring

Browse source
This commit is contained in:
Emile Vauge 2015-10-29 17:52:04 +01:00
commit 9f736f4235
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
circle.yml
View file

@ -6,6 +6,7 @@ machine:
environment: environment:
REPO: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME REPO: $CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME
DOCKER_HOST: tcp://172.17.42.1:2375 DOCKER_HOST: tcp://172.17.42.1:2375
MAKE_DOCKER_HOST: $DOCKER_HOST
VERSION: v1.0.alpha.$CIRCLE_BUILD_NUM VERSION: v1.0.alpha.$CIRCLE_BUILD_NUM
dependencies: dependencies:
@ -19,7 +20,7 @@ dependencies:
test: test:
override: override:
- make test-unit - make test-unit
- make MAKE_DOCKER_HOST=$DOCKER_HOST test-integration - make test-integration
post: post:
- make crossbinary - make crossbinary
- make image - make image