From 15318c4631240f15372ee629cff29d940ce854bb Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Thu, 5 Nov 2015 15:14:25 +0100 Subject: [PATCH] Fix docker labels (frontend.*) Using Docker provider, you can specify `traefik.frontend.rule` and `traefik.frontend.value` labels. If they are not both provided, there is a default behavior. On the current master, if they are not defined, the container is filtered (and thus the default behavior is broken). Fixes that. Signed-off-by: Vincent Demeester --- Makefile | 3 +- integration/docker_test.go | 226 +++++++++++++++++++++++++++++++- integration/integration_test.go | 11 -- provider/docker.go | 11 +- 4 files changed, 233 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index 8874d0c69..486004295 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,8 @@ TRAEFIK_ENVS := \ -e OS_ARCH_ARG \ -e OS_PLATFORM_ARG \ - -e TESTFLAGS + -e TESTFLAGS \ + -e CIRCLECI BIND_DIR := "dist" TRAEFIK_MOUNT := -v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/emilevauge/traefik/$(BIND_DIR)" diff --git a/integration/docker_test.go b/integration/docker_test.go index f27798368..0f11049bf 100644 --- a/integration/docker_test.go +++ b/integration/docker_test.go @@ -1,15 +1,140 @@ package main import ( + "encoding/json" + "fmt" + "io/ioutil" "net/http" "os" "os/exec" "time" + "github.com/docker/docker/opts" + "github.com/docker/docker/pkg/namesgenerator" + "github.com/fsouza/go-dockerclient" checker "github.com/vdemeester/shakers" check "gopkg.in/check.v1" ) +var ( + // Label added to started container to identify them as part of the integration test + TestLabel = "io.traefik.test" + + // Images to have or pull before the build in order to make it work + // FIXME handle this offline but loading them before build + RequiredImages = map[string]string{ + "swarm": "1.0.0", + "nginx": "1", + } +) + +// Docker test suites +type DockerSuite struct { + BaseSuite + client *docker.Client +} + +func (s *DockerSuite) startContainer(c *check.C, image string, args ...string) string { + return s.startContainerWithConfig(c, docker.CreateContainerOptions{ + Config: &docker.Config{ + Image: image, + Cmd: args, + }, + }) +} + +func (s *DockerSuite) startContainerWithLabels(c *check.C, image string, labels map[string]string, args ...string) string { + return s.startContainerWithConfig(c, docker.CreateContainerOptions{ + Config: &docker.Config{ + Image: image, + Cmd: args, + Labels: labels, + }, + }) +} + +func (s *DockerSuite) startContainerWithConfig(c *check.C, config docker.CreateContainerOptions) string { + if config.Name == "" { + config.Name = namesgenerator.GetRandomName(10) + } + if config.Config.Labels == nil { + config.Config.Labels = map[string]string{} + } + config.Config.Labels[TestLabel] = "true" + + container, err := s.client.CreateContainer(config) + c.Assert(err, checker.IsNil, check.Commentf("Error creating a container using config %v", config)) + + err = s.client.StartContainer(container.ID, &docker.HostConfig{}) + c.Assert(err, checker.IsNil, check.Commentf("Error starting container %v", container)) + + return container.Name +} + +func (s *DockerSuite) SetUpSuite(c *check.C) { + dockerHost := os.Getenv("DOCKER_HOST") + if dockerHost == "" { + // FIXME Handle windows -- see if dockerClient already handle that or not + dockerHost = fmt.Sprintf("unix://%s", opts.DefaultUnixSocket) + } + // Make sure we can speak to docker + dockerClient, err := docker.NewClient(dockerHost) + c.Assert(err, checker.IsNil, check.Commentf("Error connecting to docker daemon")) + + s.client = dockerClient + c.Assert(s.client.Ping(), checker.IsNil) + + // Pull required images + for repository, tag := range RequiredImages { + image := fmt.Sprintf("%s:%s", repository, tag) + _, err := s.client.InspectImage(image) + if err != nil { + if err != docker.ErrNoSuchImage { + c.Fatalf("Error while inspect image %s", image) + } + err = s.client.PullImage(docker.PullImageOptions{ + Repository: repository, + Tag: tag, + }, docker.AuthConfiguration{}) + c.Assert(err, checker.IsNil, check.Commentf("Error while pulling image %s", image)) + } + } +} + +func (s *DockerSuite) cleanContainers(c *check.C) { + // Clean the mess, a.k.a. the running containers with the right label + containerList, err := s.client.ListContainers(docker.ListContainersOptions{ + Filters: map[string][]string{ + "label": {fmt.Sprintf("%s=true", TestLabel)}, + }, + }) + c.Assert(err, checker.IsNil, check.Commentf("Error listing containers started by traefik")) + + for _, container := range containerList { + err = s.client.KillContainer(docker.KillContainerOptions{ + ID: container.ID, + }) + c.Assert(err, checker.IsNil, check.Commentf("Error killing container %v", container)) + if os.Getenv("CIRCLECI") == "" { + // On circleci, we won't delete them — it errors out for now >_< + err = s.client.RemoveContainer(docker.RemoveContainerOptions{ + ID: container.ID, + RemoveVolumes: true, + }) + c.Assert(err, checker.IsNil, check.Commentf("Error removing container %v", container)) + } + } +} + +func (s *DockerSuite) TearDownTest(c *check.C) { + s.cleanContainers(c) +} + +func (s *DockerSuite) TearDownSuite(c *check.C) { + // Call cleanContainers, just in case (?) + // s.cleanContainers(c) +} + func (s *DockerSuite) TestSimpleConfiguration(c *check.C) { file := s.adaptFileForHost(c, "fixtures/docker/simple.toml") defer os.Remove(file) @@ -17,15 +142,110 @@ func (s *DockerSuite) TestSimpleConfiguration(c *check.C) { cmd := exec.Command(traefikBinary, file) err := cmd.Start() c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() time.Sleep(500 * time.Millisecond) // TODO validate : run on 80 resp, err := http.Get("http://127.0.0.1/") + c.Assert(err, checker.IsNil) // Expected a 404 as we did not comfigure anything + c.Assert(resp.StatusCode, checker.Equals, 404) +} + +func (s *DockerSuite) TestDefaultDockerContainers(c *check.C) { + file := s.adaptFileForHost(c, "fixtures/docker/simple.toml") + defer os.Remove(file) + name := s.startContainer(c, "swarm:1.0.0", "manage", "token://blablabla") + + // Start traefik + cmd := exec.Command(traefikBinary, file) + err := cmd.Start() + c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() + + // FIXME Need to wait than 500 milliseconds more (for swarm or traefik to boot up ?) + time.Sleep(1500 * time.Millisecond) + + client := &http.Client{} + req, err := http.NewRequest("GET", "http://127.0.0.1/version", nil) + c.Assert(err, checker.IsNil) + req.Host = fmt.Sprintf("%s.docker.localhost", name) + resp, err := client.Do(req) + + c.Assert(err, checker.IsNil) + c.Assert(resp.StatusCode, checker.Equals, 200) + + body, err := ioutil.ReadAll(resp.Body) + c.Assert(err, checker.IsNil) + + var version map[string]interface{} + + c.Assert(json.Unmarshal(body, &version), checker.IsNil) + c.Assert(version["Version"], checker.Equals, "swarm/1.0.0") +} + +func (s *DockerSuite) TestDockerContainersWithLabels(c *check.C) { + file := s.adaptFileForHost(c, "fixtures/docker/simple.toml") + defer os.Remove(file) + // Start a container with some labels + labels := map[string]string{ + "traefik.frontend.rule": "Host", + "traefik.frontend.value": "my.super.host", + } + s.startContainerWithLabels(c, "swarm:1.0.0", labels, "manage", "token://blabla") + + // Start traefik + cmd := exec.Command(traefikBinary, file) + err := cmd.Start() + c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() + + // FIXME Need to wait than 500 milliseconds more (for swarm or traefik to boot up ?) + time.Sleep(1500 * time.Millisecond) + + client := &http.Client{} + req, err := http.NewRequest("GET", "http://127.0.0.1/version", nil) + c.Assert(err, checker.IsNil) + req.Host = fmt.Sprintf("my.super.host") + resp, err := client.Do(req) + + c.Assert(err, checker.IsNil) + c.Assert(resp.StatusCode, checker.Equals, 200) + + body, err := ioutil.ReadAll(resp.Body) + c.Assert(err, checker.IsNil) + + var version map[string]interface{} + + c.Assert(json.Unmarshal(body, &version), checker.IsNil) + c.Assert(version["Version"], checker.Equals, "swarm/1.0.0") +} + +func (s *DockerSuite) TestDockerContainersWithOneMissingLabels(c *check.C) { + file := s.adaptFileForHost(c, "fixtures/docker/simple.toml") + defer os.Remove(file) + // Start a container with some labels + labels := map[string]string{ + "traefik.frontend.value": "my.super.host", + } + s.startContainerWithLabels(c, "swarm:1.0.0", labels, "manage", "token://blabla") + + // Start traefik + cmd := exec.Command(traefikBinary, file) + err := cmd.Start() + c.Assert(err, checker.IsNil) + defer cmd.Process.Kill() + + // FIXME Need to wait than 500 milliseconds more (for swarm or traefik to boot up ?) + time.Sleep(1500 * time.Millisecond) + + client := &http.Client{} + req, err := http.NewRequest("GET", "http://127.0.0.1/version", nil) + c.Assert(err, checker.IsNil) + req.Host = fmt.Sprintf("my.super.host") + resp, err := client.Do(req) + c.Assert(err, checker.IsNil) c.Assert(resp.StatusCode, checker.Equals, 404) - - killErr := cmd.Process.Kill() - c.Assert(killErr, checker.IsNil) } diff --git a/integration/integration_test.go b/integration/integration_test.go index 2e57021e7..4cee94201 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -41,17 +41,6 @@ func (s *FileSuite) SetUpSuite(c *check.C) { s.composeProject.Up() } -// Docker test suites -type DockerSuite struct{ BaseSuite } - -func (s *DockerSuite) SetUpSuite(c *check.C) { - // Make sure we can speak to docker -} - -func (s *DockerSuite) TearDownSuite(c *check.C) { - // Clean the mess -} - // Consul test suites (using libcompose) type ConsulSuite struct{ BaseSuite } diff --git a/provider/docker.go b/provider/docker.go index 8707c1c74..ab1da5bc5 100644 --- a/provider/docker.go +++ b/provider/docker.go @@ -151,7 +151,8 @@ func (provider *Docker) loadDockerConfig(dockerClient *docker.Client) *types.Con return false } - if _, err := provider.getLabels(container, []string{"traefik.frontend.rule", "traefik.frontend.value"}); err != nil { + labels, err := provider.getLabels(container, []string{"traefik.frontend.rule", "traefik.frontend.value"}) + if len(labels) != 0 && err != nil { log.Debugf("Filtering bad labeled container %s", container.Name) return false } @@ -225,15 +226,19 @@ func (provider *Docker) getLabel(container docker.Container, label string) (stri } func (provider *Docker) getLabels(container docker.Container, labels []string) (map[string]string, error) { + var globalErr error foundLabels := map[string]string{} for _, label := range labels { foundLabel, err := provider.getLabel(container, label) + // Error out only if one of them is defined. if err != nil { - return nil, errors.New("Label not found: " + label) + globalErr = errors.New("Label not found: " + label) + continue } foundLabels[label] = foundLabel + } - return foundLabels, nil + return foundLabels, globalErr } // GetFrontendValue returns the frontend value for the specified container, using