From 4277fe2fdb22821add0f977af2247d2e67c4ba7d Mon Sep 17 00:00:00 2001 From: David Keijser Date: Tue, 16 Feb 2016 10:22:21 +0100 Subject: [PATCH] Bump libcompose --- glide.yaml | 2 +- integration/integration_test.go | 4 +++- integration/resources/compose/marathon.yml | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/glide.yaml b/glide.yaml index e0aacec11..1d15ab1c3 100644 --- a/glide.yaml +++ b/glide.yaml @@ -124,7 +124,7 @@ import: - package: gopkg.in/alecthomas/kingpin.v2 ref: 639879d6110b1b0409410c7b737ef0bb18325038 - package: github.com/docker/libcompose - ref: 79ef5d150f053a5b12f16b02d8844ed7cf33611a + ref: d3089811c119a211469a9cc93caea684d937e5d3 subpackages: - docker - logger diff --git a/integration/integration_test.go b/integration/integration_test.go index 27b6d41f5..9cefca130 100644 --- a/integration/integration_test.go +++ b/integration/integration_test.go @@ -80,7 +80,9 @@ func (s *BaseSuite) TearDownSuite(c *check.C) { func (s *BaseSuite) createComposeProject(c *check.C, name string) { composeProject, err := docker.NewProject(&docker.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), }, }) diff --git a/integration/resources/compose/marathon.yml b/integration/resources/compose/marathon.yml index 91685e963..d489db2fa 100644 --- a/integration/resources/compose/marathon.yml +++ b/integration/resources/compose/marathon.yml @@ -3,7 +3,7 @@ zk: net: host environment: ZK_CONFIG: tickTime=2000,initLimit=10,syncLimit=5,maxClientCnxns=128,forceSync=no,clientPort=2181 - ZK_ID: 1 + ZK_ID: " 1" master: 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_HOSTNAME: 127.0.0.1 MESOS_IP: 127.0.0.1 - MESOS_QUORUM: 1 + MESOS_QUORUM: " 1" MESOS_CLUSTER: docker-compose MESOS_WORK_DIR: /var/lib/mesos