Skip to content

Commit e569518

Browse files
committed
use compose v5
Signed-off-by: Nicolas De Loof <[email protected]>
1 parent ec51c67 commit e569518

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ compose-clone: compose-clean
6767

6868
.PHONY: compose-replace
6969
compose-replace:
70-
cd modules/compose && echo "replace github.com/docker/compose/v2 => ../../.build/compose" >> go.mod
70+
cd modules/compose && echo "replace github.com/docker/compose/v5 => ../../.build/compose" >> go.mod
7171

7272
.PHONY: compose-spec-replace
7373
compose-spec-replace:

modules/compose/compose.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ import (
1212
"github.com/compose-spec/compose-go/v2/types"
1313
"github.com/docker/cli/cli/command"
1414
"github.com/docker/cli/cli/flags"
15-
"github.com/docker/compose/v2/pkg/api"
16-
"github.com/docker/compose/v2/pkg/compose"
15+
"github.com/docker/compose/v5/pkg/api"
16+
"github.com/docker/compose/v5/pkg/compose"
1717
"github.com/google/uuid"
1818

1919
"github.com/testcontainers/testcontainers-go"

modules/compose/compose_api.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/compose-spec/compose-go/v2/cli"
1717
"github.com/compose-spec/compose-go/v2/types"
1818
"github.com/docker/cli/cli/command"
19-
"github.com/docker/compose/v2/pkg/api"
19+
"github.com/docker/compose/v5/pkg/api"
2020
"github.com/docker/docker/api/types/container"
2121
"github.com/docker/docker/api/types/filters"
2222
dockernetwork "github.com/docker/docker/api/types/network"

modules/compose/compose_api_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010
"testing"
1111
"time"
1212

13-
"github.com/docker/compose/v2/pkg/api"
13+
"github.com/docker/compose/v5/pkg/api"
1414
"github.com/docker/docker/api/types/filters"
1515
"github.com/docker/docker/api/types/volume"
1616
"github.com/google/uuid"

modules/compose/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ replace github.com/testcontainers/testcontainers-go => ../..
77
require (
88
github.com/compose-spec/compose-go/v2 v2.9.0
99
github.com/docker/cli v28.5.1+incompatible
10-
github.com/docker/compose/v2 v2.40.2
10+
github.com/docker/compose/v5 v5.0.0-rc.2
1111
github.com/docker/docker v28.5.1+incompatible
1212
github.com/google/uuid v1.6.0
1313
github.com/stretchr/testify v1.11.1

modules/compose/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ github.com/docker/cli v28.5.1+incompatible h1:ESutzBALAD6qyCLqbQSEf1a/U8Ybms5agw
130130
github.com/docker/cli v28.5.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
131131
github.com/docker/cli-docs-tool v0.10.0 h1:bOD6mKynPQgojQi3s2jgcUWGp/Ebqy1SeCr9VfKQLLU=
132132
github.com/docker/cli-docs-tool v0.10.0/go.mod h1:5EM5zPnT2E7yCLERZmrDA234Vwn09fzRHP4aX1qwp1U=
133-
github.com/docker/compose/v2 v2.40.2 h1:h2bDBJkOuqmj93XvT2oI0ArPQonE0lGtWiILXdiXvbA=
134-
github.com/docker/compose/v2 v2.40.2/go.mod h1:CbSJpKGw20LInVsPjglZ8z7Squ3OBQOD7Ux5nkjGfIU=
133+
github.com/docker/compose/v5 v2.40.2 h1:h2bDBJkOuqmj93XvT2oI0ArPQonE0lGtWiILXdiXvbA=
134+
github.com/docker/compose/v5 v2.40.2/go.mod h1:CbSJpKGw20LInVsPjglZ8z7Squ3OBQOD7Ux5nkjGfIU=
135135
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
136136
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
137137
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=

0 commit comments

Comments
 (0)