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

Merge pull request #277 from vdemeester/micro-libkermit-update

Browse source 
Update libkermit again for compose enhancements
This commit is contained in:
Emile Vauge 2016-04-04 10:34:43 +02:00
commit 79dc4f9a70
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
glide.lock generated
View file

@ -1,5 +1,5 @@
hash: 7ae4c083b2f2754acc858a7e2cd453343966dc62eef01fbd51adf8c718959a0c hash: 2e15595ec349ec462fa2b0a52e26e3f3dcbd17fed66dad9a1e1c2e2c0385fe49
updated: 2016-04-02T12:38:43.346296635+02:00 updated: 2016-04-02T15:25:37.354420171+02:00
imports: imports:
- name: github.com/alecthomas/template - name: github.com/alecthomas/template
version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0 version: b867cc6ab45cece8143cfcc6fc9c77cf3f2c23c0
@ -224,7 +224,7 @@ imports:
- name: github.com/unrolled/render - name: github.com/unrolled/render
version: 26b4e3aac686940fe29521545afad9966ddfc80c version: 26b4e3aac686940fe29521545afad9966ddfc80c
- name: github.com/vdemeester/libkermit - name: github.com/vdemeester/libkermit
version: 9012902ed333111cf804fd5a28114d8a64002951 version: 7e4e689a6fa9281e0fb9b7b9c297e22d5342a5ec
- name: github.com/vdemeester/shakers - name: github.com/vdemeester/shakers
version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3 version: 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
- name: github.com/vulcand/oxy - name: github.com/vulcand/oxy

2
glide.yaml
View file

@ -154,7 +154,7 @@ import:
- package: github.com/stretchr/testify/mock - package: github.com/stretchr/testify/mock
- package: github.com/xenolf/lego - package: github.com/xenolf/lego
- package: github.com/vdemeester/libkermit - package: github.com/vdemeester/libkermit
ref: 9012902ed333111cf804fd5a28114d8a64002951 ref: 7e4e689a6fa9281e0fb9b7b9c297e22d5342a5ec
- package: github.com/docker/libcompose - package: github.com/docker/libcompose
version: e290a513ba909ca3afefd5cd611f3a3fe56f6a3a version: e290a513ba909ca3afefd5cd611f3a3fe56f6a3a
- package: github.com/docker/distribution - package: github.com/docker/distribution

7
integration/consul_catalog_test.go
View file

@ -9,7 +9,6 @@ import (
"github.com/go-check/check" "github.com/go-check/check"
"github.com/hashicorp/consul/api" "github.com/hashicorp/consul/api"
docker "github.com/vdemeester/libkermit/docker/check"
checker "github.com/vdemeester/shakers" checker "github.com/vdemeester/shakers"
) )
@ -18,16 +17,14 @@ type ConsulCatalogSuite struct {
BaseSuite BaseSuite
consulIP string consulIP string
consulClient *api.Client consulClient *api.Client
project *docker.Project
} }
func (s *ConsulCatalogSuite) SetUpSuite(c *check.C) { func (s *ConsulCatalogSuite) SetUpSuite(c *check.C) {
s.project = docker.NewProjectFromEnv(c)
s.createComposeProject(c, "consul_catalog") s.createComposeProject(c, "consul_catalog")
s.composeProject.Start(c) s.composeProject.Start(c)
consul := s.project.Inspect(c, "integration-test-consul_catalog_consul_1") consul := s.composeProject.Container(c, "consul")
s.consulIP = consul.NetworkSettings.IPAddress s.consulIP = consul.NetworkSettings.IPAddress
config := api.DefaultConfig() config := api.DefaultConfig()
@ -94,7 +91,7 @@ func (s *ConsulCatalogSuite) TestSingleService(c *check.C) {
c.Assert(err, checker.IsNil) c.Assert(err, checker.IsNil)
defer cmd.Process.Kill() defer cmd.Process.Kill()
nginx := s.project.Inspect(c, "integration-test-consul_catalog_nginx_1") nginx := s.composeProject.Container(c, "nginx")
err = s.registerService("test", nginx.NetworkSettings.IPAddress, 80) err = s.registerService("test", nginx.NetworkSettings.IPAddress, 80)
c.Assert(err, checker.IsNil, check.Commentf("Error registering service")) c.Assert(err, checker.IsNil, check.Commentf("Error registering service"))