SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into docker_network

Browse Source
This commit is contained in:
Erin Dachtler
2016-06-01 08:38:23 -07:00
parent 82b1f14e2b d6547462e5
commit 7386378cc0
23 changed files with 563 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
provider/docker.go
View File

@@ -79,7 +79,8 @@ func (provider *Docker) createClient() (client.APIClient, error) {
// Provide allows the provider to provide configurations to traefik
// using the given configuration channel.
func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool) error {
func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints []types.Constraint) error {
provider.Constraints = append(provider.Constraints, constraints...)
// TODO register this routine in pool, and watch for stop channel
safe.Go(func() {
operation := func() error {