Skip to content

Commit 7289e87

Browse files
gloursglours
authored
Merge pull request docker#9700 from glours/bump-compose-go-1.4.0
update to compose-go v1.4.0 as previous version introduced breaking changes
2 parents 57f98ef + 0524691 commit 7289e87

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ require (
66
github.com/AlecAivazis/survey/v2 v2.3.5
77
github.com/buger/goterm v1.0.4
88
github.com/cnabio/cnab-to-oci v0.3.5
9-
github.com/compose-spec/compose-go v1.3.0
9+
github.com/compose-spec/compose-go v1.4.0
1010
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.6.6
1212
github.com/distribution/distribution/v3 v3.0.0-20220725133111-4bf3547399eb

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoC
286286
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
287287
github.com/codahale/hdrhistogram v0.0.0-20160425231609-f8ad88b59a58/go.mod h1:sE/e/2PUdi/liOCUjSTXgM1o87ZssimdTWN964YiIeI=
288288
github.com/compose-spec/compose-go v1.2.1/go.mod h1:pAy7Mikpeft4pxkFU565/DRHEbDfR84G6AQuiL+Hdg8=
289-
github.com/compose-spec/compose-go v1.3.0 h1:n5fSOUXQsfnCpn/lZBgNM3qEu1PDhvcbWrWXVBlUNmA=
290-
github.com/compose-spec/compose-go v1.3.0/go.mod h1:l7RUULbFFLzlQHuxtJr7SVLyWdqEpbJEGTWCgcu6Eqw=
289+
github.com/compose-spec/compose-go v1.4.0 h1:zaYVAZ6lIByr7Jffi20AabfeUwcTrdXfH3X1R5HEm+g=
290+
github.com/compose-spec/compose-go v1.4.0/go.mod h1:l7RUULbFFLzlQHuxtJr7SVLyWdqEpbJEGTWCgcu6Eqw=
291291
github.com/containerd/aufs v0.0.0-20200908144142-dab0cbea06f4/go.mod h1:nukgQABAEopAHvB6j7cnP5zJ+/3aVcE7hCYqvIwAHyE=
292292
github.com/containerd/aufs v0.0.0-20201003224125-76a6863f2989/go.mod h1:AkGGQs9NM2vtYHaUen+NljV0/baGCAPELGm2q9ZXpWU=
293293
github.com/containerd/aufs v0.0.0-20210316121734-20793ff83c97/go.mod h1:kL5kd6KM5TzQjR79jljyi4olc1Vrx6XBlcyj3gNv2PU=

‎pkg/e2e/compose_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func TestLocalComposeUp(t *testing.T) {
4949
assert.Assert(t, strings.Contains(output, `"word":`))
5050

5151
res = c.RunDockerCmd(t, "network", "ls")
52-
res.Assert(t, icmd.Expected{Out: projectName + "-default"})
52+
res.Assert(t, icmd.Expected{Out: projectName + "_default"})
5353
})
5454

5555
t.Run("top", func(t *testing.T) {
@@ -74,7 +74,7 @@ func TestLocalComposeUp(t *testing.T) {
7474
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.service": "web"`})
7575
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.version":`})
7676

77-
res = c.RunDockerCmd(t, "network", "inspect", projectName+"-default")
77+
res = c.RunDockerCmd(t, "network", "inspect", projectName+"_default")
7878
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.network": "default"`})
7979
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.project": `})
8080
res.Assert(t, icmd.Expected{Out: `"com.docker.compose.version": `})
@@ -241,6 +241,6 @@ func TestConvert(t *testing.T) {
241241
default: null
242242
networks:
243243
default:
244-
name: compose-e2e-convert-default`, filepath.Join(wd, "fixtures", "simple-build-test", "nginx-build")), ExitCode: 0})
244+
name: compose-e2e-convert_default`, filepath.Join(wd, "fixtures", "simple-build-test", "nginx-build")), ExitCode: 0})
245245
})
246246
}

‎pkg/e2e/networks_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestNetworks(t *testing.T) {
5252
assert.Assert(t, strings.Contains(output, `"word":`))
5353

5454
res = c.RunDockerCmd(t, "network", "ls")
55-
res.Assert(t, icmd.Expected{Out: projectName + "-dbnet"})
55+
res.Assert(t, icmd.Expected{Out: projectName + "_dbnet"})
5656
res.Assert(t, icmd.Expected{Out: "microservices"})
5757
})
5858

@@ -126,7 +126,7 @@ func TestIPAMConfig(t *testing.T) {
126126
const projectName = "ipam_e2e"
127127

128128
t.Run("ensure we do not reuse previous networks", func(t *testing.T) {
129-
c.RunDockerOrExitError(t, "network", "rm", projectName+"-default")
129+
c.RunDockerOrExitError(t, "network", "rm", projectName+"_default")
130130
})
131131

132132
t.Run("up", func(t *testing.T) {
@@ -135,7 +135,7 @@ func TestIPAMConfig(t *testing.T) {
135135

136136
t.Run("ensure service get fixed IP assigned", func(t *testing.T) {
137137
res := c.RunDockerCmd(t, "inspect", projectName+"-foo-1", "-f",
138-
fmt.Sprintf(`{{ $network := index .NetworkSettings.Networks "%s-default" }}{{ $network.IPAMConfig.IPv4Address }}`, projectName))
138+
fmt.Sprintf(`{{ $network := index .NetworkSettings.Networks "%s_default" }}{{ $network.IPAMConfig.IPv4Address }}`, projectName))
139139
res.Assert(t, icmd.Expected{Out: "10.1.0.100"})
140140
})
141141

‎pkg/e2e/volumes_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func TestProjectVolumeBind(t *testing.T) {
107107

108108
c.RunDockerComposeCmd(t, "--project-name", projectName, "down")
109109

110-
c.RunDockerOrExitError(t, "volume", "rm", "-f", projectName+"-project-data").Assert(t, icmd.Success)
110+
c.RunDockerOrExitError(t, "volume", "rm", "-f", projectName+"_project-data").Assert(t, icmd.Success)
111111
cmd := c.NewCmdWithEnv([]string{"TEST_DIR=" + tmpDir},
112112
"docker", "compose", "--project-directory", "fixtures/project-volume-bind-test", "--project-name", projectName, "up", "-d")
113113
icmd.RunCmd(cmd).Assert(t, icmd.Success)

0 commit comments

Comments
 (0)