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

Bump libcompose

Browse source
This commit is contained in:
David Keijser 2016-02-16 10:22:21 +01:00
parent 7acc2beae0
commit 4277fe2fdb
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
glide.yaml
View file

@ -124,7 +124,7 @@ import:
- package: gopkg.in/alecthomas/kingpin.v2 - package: gopkg.in/alecthomas/kingpin.v2
ref: 639879d6110b1b0409410c7b737ef0bb18325038 ref: 639879d6110b1b0409410c7b737ef0bb18325038
- package: github.com/docker/libcompose - package: github.com/docker/libcompose
ref: 79ef5d150f053a5b12f16b02d8844ed7cf33611a ref: d3089811c119a211469a9cc93caea684d937e5d3
subpackages: subpackages:
- docker - docker
- logger - logger

4
integration/integration_test.go
View file

@ -80,7 +80,9 @@ func (s *BaseSuite) TearDownSuite(c *check.C) {
func (s *BaseSuite) createComposeProject(c *check.C, name string) { func (s *BaseSuite) createComposeProject(c *check.C, name string) {
composeProject, err := docker.NewProject(&docker.Context{ composeProject, err := docker.NewProject(&docker.Context{
Context: project.Context{ Context: project.Context{
ComposeFile: fmt.Sprintf("resources/compose/%s.yml", name), ComposeFiles: []string{
fmt.Sprintf("resources/compose/%s.yml", name),
},
ProjectName: fmt.Sprintf("integration-test-%s", name), ProjectName: fmt.Sprintf("integration-test-%s", name),
}, },
}) })

4
integration/resources/compose/marathon.yml
View file

@ -3,7 +3,7 @@ zk:
net: host net: host
environment: environment:
ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181 ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181
ZK_ID: 1 ZK_ID: " 1"
master: master:
image: mesosphere/mesos-master:0.23.0-1.0.ubuntu1404 image: mesosphere/mesos-master:0.23.0-1.0.ubuntu1404
@ -12,7 +12,7 @@ master:
MESOS_ZK: zk://127.0.0.1:2181/mesos MESOS_ZK: zk://127.0.0.1:2181/mesos
MESOS_HOSTNAME: 127.0.0.1 MESOS_HOSTNAME: 127.0.0.1
MESOS_IP: 127.0.0.1 MESOS_IP: 127.0.0.1
MESOS_QUORUM: 1 MESOS_QUORUM: " 1"
MESOS_CLUSTER: docker-compose MESOS_CLUSTER: docker-compose
MESOS_WORK_DIR: /var/lib/mesos MESOS_WORK_DIR: /var/lib/mesos