homelab/traefik
1
0
Fork 0
Code Activity

feat(constraints): Supports constraints for docker backend

Browse source
This commit is contained in:
Samuel BERTHE 2016-06-06 21:59:58 +02:00
parent 01ffad2e6e
commit f7224ff403
3 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
provider/docker.go
View file

@ -177,11 +177,12 @@ func (provider *Docker) loadDockerConfig(containersInspected []dockertypes.Conta
}
// filter containers
filteredContainers := fun.Filter(containerFilter, containersInspected).([]dockertypes.ContainerJSON)
filteredContainers := fun.Filter(provider.ContainerFilter, containersInspected).([]dockertypes.ContainerJSON)
frontends := map[string][]dockertypes.ContainerJSON{}
for _, container := range filteredContainers {
frontends[provider.getFrontendName(container)] = append(frontends[provider.getFrontendName(container)], container)
frontendName := provider.getFrontendName(container)
frontends[frontendName] = append(frontends[frontendName], container)
}
templateObjects := struct {
@ -201,7 +202,8 @@ func (provider *Docker) loadDockerConfig(containersInspected []dockertypes.Conta
return configuration
}
func containerFilter(container dockertypes.ContainerJSON) bool {
// ContainerFilter checks if container have to be exposed
func (provider *Docker) ContainerFilter(container dockertypes.ContainerJSON) bool {
_, err := strconv.Atoi(container.Config.Labels["traefik.port"])
if len(container.NetworkSettings.Ports) == 0 && err != nil {
log.Debugf("Filtering container without port and no traefik.port label %s", container.Name)
@ -217,6 +219,15 @@ func containerFilter(container dockertypes.ContainerJSON) bool {
return false
}
constraintTags := strings.Split(container.Config.Labels["traefik.tags"], ",")
ok, failingConstraint := provider.MatchConstraints(constraintTags)
if ok == false {
if failingConstraint != nil {
log.Debugf("Container %v pruned by '%v' constraint", container.Name, failingConstraint.String())
}
return false
}
return true
}

3
provider/docker_test.go
View file

@ -621,6 +621,7 @@ func TestDockerGetLabels(t *testing.T) {
}
func TestDockerTraefikFilter(t *testing.T) {
provider := Docker{}
containers := []struct {
container docker.ContainerJSON
expected bool
@ -792,7 +793,7 @@ func TestDockerTraefikFilter(t *testing.T) {
}
for _, e := range containers {
actual := containerFilter(e.container)
actual := provider.ContainerFilter(e.container)
if actual != e.expected {
t.Fatalf("expected %v for %+v, got %+v", e.expected, e, actual)
}