Skip to content

Commit becc8da

Browse files
ndeloofndeloof
committed
chore: test compose-spec/compose-go#874 (v3 yaml.Node-based loader)
Add a go.mod `replace` directive pointing the compose-go dependency at ndeloof/compose-go branch `v3-yaml-node-context` (PR compose-spec/compose-go#874) and migrate all imports from `compose-spec/compose-go/v2` to `/v3`. DO NOT MERGE — exploratory branch to validate CI against the v3 loader refactor. Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
1 parent 4732a2e commit becc8da

72 files changed

Lines changed: 100 additions & 97 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cmd/compose/build.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import (
2222
"os"
2323
"strings"
2424

25-
"github.com/compose-spec/compose-go/v2/cli"
26-
"github.com/compose-spec/compose-go/v2/types"
25+
"github.com/compose-spec/compose-go/v3/cli"
26+
"github.com/compose-spec/compose-go/v3/types"
2727
"github.com/docker/cli/cli/command"
2828
cliopts "github.com/docker/cli/opts"
2929
"github.com/spf13/cobra"

‎cmd/compose/compose.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"strings"
3030
"syscall"
3131

32-
"github.com/compose-spec/compose-go/v2/cli"
33-
"github.com/compose-spec/compose-go/v2/dotenv"
34-
"github.com/compose-spec/compose-go/v2/loader"
35-
composepaths "github.com/compose-spec/compose-go/v2/paths"
36-
"github.com/compose-spec/compose-go/v2/types"
37-
composegoutils "github.com/compose-spec/compose-go/v2/utils"
32+
"github.com/compose-spec/compose-go/v3/cli"
33+
"github.com/compose-spec/compose-go/v3/dotenv"
34+
"github.com/compose-spec/compose-go/v3/loader"
35+
composepaths "github.com/compose-spec/compose-go/v3/paths"
36+
"github.com/compose-spec/compose-go/v3/types"
37+
composegoutils "github.com/compose-spec/compose-go/v3/utils"
3838
dockercli "github.com/docker/cli/cli"
3939
"github.com/docker/cli/cli-plugins/metadata"
4040
"github.com/docker/cli/cli/command"

‎cmd/compose/compose_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package compose
1919
import (
2020
"testing"
2121

22-
"github.com/compose-spec/compose-go/v2/types"
22+
"github.com/compose-spec/compose-go/v3/types"
2323
"gotest.tools/v3/assert"
2424
)
2525

‎cmd/compose/config.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import (
2727
"sort"
2828
"strings"
2929

30-
"github.com/compose-spec/compose-go/v2/cli"
31-
"github.com/compose-spec/compose-go/v2/template"
32-
"github.com/compose-spec/compose-go/v2/types"
30+
"github.com/compose-spec/compose-go/v3/cli"
31+
"github.com/compose-spec/compose-go/v3/template"
32+
"github.com/compose-spec/compose-go/v3/types"
3333
"github.com/docker/cli/cli/command"
3434
"github.com/spf13/cobra"
3535
"go.yaml.in/yaml/v4"

‎cmd/compose/create.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"strings"
2525
"time"
2626

27-
"github.com/compose-spec/compose-go/v2/types"
27+
"github.com/compose-spec/compose-go/v3/types"
2828
"github.com/docker/cli/cli/command"
2929
"github.com/sirupsen/logrus"
3030
"github.com/spf13/cobra"

‎cmd/compose/exec.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"fmt"
2323
"os"
2424

25-
"github.com/compose-spec/compose-go/v2/types"
25+
"github.com/compose-spec/compose-go/v3/types"
2626
"github.com/docker/cli/cli"
2727
"github.com/docker/cli/cli/command"
2828
"github.com/sirupsen/logrus"

‎cmd/compose/hooks.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"os"
2424
"time"
2525

26-
"github.com/compose-spec/compose-go/v2/cli"
26+
"github.com/compose-spec/compose-go/v3/cli"
2727
"github.com/docker/cli/cli-plugins/hooks"
2828
"github.com/docker/cli/cli-plugins/metadata"
2929
"github.com/spf13/cobra"

‎cmd/compose/options.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ import (
2626
"strings"
2727
"text/tabwriter"
2828

29-
"github.com/compose-spec/compose-go/v2/cli"
30-
"github.com/compose-spec/compose-go/v2/template"
31-
"github.com/compose-spec/compose-go/v2/types"
29+
"github.com/compose-spec/compose-go/v3/cli"
30+
"github.com/compose-spec/compose-go/v3/template"
31+
"github.com/compose-spec/compose-go/v3/types"
3232
"github.com/docker/cli/cli/command"
3333

3434
"github.com/docker/compose/v5/cmd/display"

‎cmd/compose/options_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"testing"
2727

28-
"github.com/compose-spec/compose-go/v2/types"
28+
"github.com/compose-spec/compose-go/v3/types"
2929
"github.com/docker/cli/cli/streams"
3030
"go.uber.org/mock/gomock"
3131
"gotest.tools/v3/assert"

‎cmd/compose/pull.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"fmt"
2222
"os"
2323

24-
"github.com/compose-spec/compose-go/v2/cli"
25-
"github.com/compose-spec/compose-go/v2/types"
24+
"github.com/compose-spec/compose-go/v3/cli"
25+
"github.com/compose-spec/compose-go/v3/types"
2626
"github.com/docker/cli/cli/command"
2727
"github.com/morikuni/aec"
2828
"github.com/spf13/cobra"

0 commit comments

Comments
 (0)