Przeglądaj źródła

next release will be major version v5.x

Signed-off-by: Nicolas De Loof <[email protected]>
Nicolas De Loof 1 miesiąc temu
rodzic
commit
2b4543935c
100 zmienionych plików z 184 dodań i 184 usunięć
  1. 1 1
      Makefile
  2. 2 2
      README.md
  3. 2 2
      cmd/cmdtrace/cmd_span.go
  4. 1 1
      cmd/cmdtrace/cmd_span_test.go
  5. 1 1
      cmd/compatibility/convert.go
  6. 2 2
      cmd/compose/attach.go
  7. 3 3
      cmd/compose/bridge.go
  8. 3 3
      cmd/compose/build.go
  9. 2 2
      cmd/compose/commit.go
  10. 2 2
      cmd/compose/completion.go
  11. 7 7
      cmd/compose/compose.go
  12. 3 3
      cmd/compose/config.go
  13. 2 2
      cmd/compose/cp.go
  14. 2 2
      cmd/compose/create.go
  15. 3 3
      cmd/compose/down.go
  16. 2 2
      cmd/compose/events.go
  17. 2 2
      cmd/compose/exec.go
  18. 2 2
      cmd/compose/export.go
  19. 2 2
      cmd/compose/generate.go
  20. 3 3
      cmd/compose/images.go
  21. 3 3
      cmd/compose/kill.go
  22. 3 3
      cmd/compose/list.go
  23. 3 3
      cmd/compose/logs.go
  24. 3 3
      cmd/compose/options.go
  25. 1 1
      cmd/compose/options_test.go
  26. 2 2
      cmd/compose/pause.go
  27. 2 2
      cmd/compose/port.go
  28. 3 3
      cmd/compose/ps.go
  29. 2 2
      cmd/compose/publish.go
  30. 2 2
      cmd/compose/pull.go
  31. 2 2
      cmd/compose/push.go
  32. 2 2
      cmd/compose/remove.go
  33. 2 2
      cmd/compose/restart.go
  34. 4 4
      cmd/compose/run.go
  35. 2 2
      cmd/compose/scale.go
  36. 2 2
      cmd/compose/start.go
  37. 1 1
      cmd/compose/stats.go
  38. 2 2
      cmd/compose/stop.go
  39. 2 2
      cmd/compose/top.go
  40. 1 1
      cmd/compose/top_test.go
  41. 5 5
      cmd/compose/up.go
  42. 2 2
      cmd/compose/version.go
  43. 2 2
      cmd/compose/version_test.go
  44. 2 2
      cmd/compose/viz.go
  45. 2 2
      cmd/compose/volumes.go
  46. 2 2
      cmd/compose/wait.go
  47. 4 4
      cmd/compose/watch.go
  48. 1 1
      cmd/display/json.go
  49. 1 1
      cmd/display/json_test.go
  50. 1 1
      cmd/display/plain.go
  51. 1 1
      cmd/display/quiet.go
  52. 1 1
      cmd/display/tty.go
  53. 1 1
      cmd/formatter/container.go
  54. 1 1
      cmd/formatter/formatter.go
  55. 1 1
      cmd/formatter/logs.go
  56. 2 2
      cmd/formatter/shortcut.go
  57. 6 6
      cmd/main.go
  58. 2 2
      cmd/prompt/prompt.go
  59. 2 2
      docs/sdk.md
  60. 1 1
      docs/yaml/main/generate.go
  61. 1 1
      go.mod
  62. 2 2
      internal/desktop/client.go
  63. 1 1
      internal/experimental/experimental.go
  64. 1 1
      internal/oci/push.go
  65. 1 1
      internal/oci/resolver.go
  66. 1 1
      internal/tracing/docker_context.go
  67. 1 1
      internal/tracing/tracing.go
  68. 1 1
      internal/tracing/tracing_test.go
  69. 1 1
      pkg/api/labels.go
  70. 1 1
      pkg/api/labels_test.go
  71. 2 2
      pkg/bridge/convert.go
  72. 2 2
      pkg/compose/attach.go
  73. 1 1
      pkg/compose/attach_service.go
  74. 3 3
      pkg/compose/build.go
  75. 1 1
      pkg/compose/build_bake.go
  76. 1 1
      pkg/compose/build_classic.go
  77. 1 1
      pkg/compose/commit.go
  78. 2 2
      pkg/compose/compose.go
  79. 1 1
      pkg/compose/containers.go
  80. 3 3
      pkg/compose/convergence.go
  81. 2 2
      pkg/compose/convergence_test.go
  82. 1 1
      pkg/compose/cp.go
  83. 1 1
      pkg/compose/create.go
  84. 1 1
      pkg/compose/create_test.go
  85. 1 1
      pkg/compose/dependencies.go
  86. 1 1
      pkg/compose/dependencies_test.go
  87. 2 2
      pkg/compose/down.go
  88. 2 2
      pkg/compose/down_test.go
  89. 1 1
      pkg/compose/events.go
  90. 1 1
      pkg/compose/exec.go
  91. 1 1
      pkg/compose/export.go
  92. 1 1
      pkg/compose/filters.go
  93. 1 1
      pkg/compose/generate.go
  94. 2 2
      pkg/compose/hook.go
  95. 1 1
      pkg/compose/image_pruner.go
  96. 1 1
      pkg/compose/images.go
  97. 1 1
      pkg/compose/images_test.go
  98. 1 1
      pkg/compose/kill.go
  99. 1 1
      pkg/compose/kill_test.go
  100. 2 2
      pkg/compose/loader.go

+ 1 - 1
Makefile

@@ -12,7 +12,7 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-PKG := github.com/docker/compose/v2
+PKG := github.com/docker/compose/v5
 VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
 
 GO_LDFLAGS ?= -w -X ${PKG}/internal.Version=${VERSION}

+ 2 - 2
README.md

@@ -9,9 +9,9 @@
 # Docker Compose v2
 
 [![GitHub release](https://img.shields.io/github/v/release/docker/compose.svg?style=flat-square)](https://github.com/docker/compose/releases/latest)
-[![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?style=flat-square&logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/compose/v2)
+[![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?style=flat-square&logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/compose/v5)
 [![Build Status](https://img.shields.io/github/actions/workflow/status/docker/compose/ci.yml?label=ci&logo=github&style=flat-square)](https://github.com/docker/compose/actions?query=workflow%3Aci)
-[![Go Report Card](https://goreportcard.com/badge/github.com/docker/compose/v2?style=flat-square)](https://goreportcard.com/report/github.com/docker/compose/v2)
+[![Go Report Card](https://goreportcard.com/badge/github.com/docker/compose/v5?style=flat-square)](https://goreportcard.com/report/github.com/docker/compose/v5)
 [![Codecov](https://codecov.io/gh/docker/compose/branch/main/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose)
 [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/docker/compose/badge)](https://api.securityscorecards.dev/projects/github.com/docker/compose)
 ![Docker Compose](logo.png?raw=true "Docker Compose Logo")

+ 2 - 2
cmd/cmdtrace/cmd_span.go

@@ -26,8 +26,8 @@ import (
 
 	dockercli "github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	commands "github.com/docker/compose/v2/cmd/compose"
-	"github.com/docker/compose/v2/internal/tracing"
+	commands "github.com/docker/compose/v5/cmd/compose"
+	"github.com/docker/compose/v5/internal/tracing"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 	"go.opentelemetry.io/otel"

+ 1 - 1
cmd/cmdtrace/cmd_span_test.go

@@ -20,7 +20,7 @@ import (
 	"reflect"
 	"testing"
 
-	commands "github.com/docker/compose/v2/cmd/compose"
+	commands "github.com/docker/compose/v5/cmd/compose"
 	"github.com/spf13/cobra"
 	flag "github.com/spf13/pflag"
 )

+ 1 - 1
cmd/compatibility/convert.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/compose/v2/cmd/compose"
+	"github.com/docker/compose/v5/cmd/compose"
 )
 
 func getCompletionCommands() []string {

+ 2 - 2
cmd/compose/attach.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 3 - 3
cmd/compose/bridge.go

@@ -28,9 +28,9 @@ import (
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/bridge"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/bridge"
+	"github.com/docker/compose/v5/pkg/compose"
 )
 
 func bridgeCommand(p *ProjectOptions, dockerCli command.Cli) *cobra.Command {

+ 3 - 3
cmd/compose/build.go

@@ -26,11 +26,11 @@ import (
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
 	cliopts "github.com/docker/cli/opts"
-	"github.com/docker/compose/v2/cmd/display"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/display"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type buildOptions struct {

+ 2 - 2
cmd/compose/commit.go

@@ -21,8 +21,8 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/opts"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 2 - 2
cmd/compose/completion.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 7 - 7
cmd/compose/compose.go

@@ -39,13 +39,13 @@ import (
 	"github.com/docker/cli/cli-plugins/metadata"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/pkg/kvfile"
-	"github.com/docker/compose/v2/cmd/display"
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/internal/tracing"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
-	"github.com/docker/compose/v2/pkg/remote"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/cmd/display"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/internal/tracing"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
+	"github.com/docker/compose/v5/pkg/remote"
+	"github.com/docker/compose/v5/pkg/utils"
 	"github.com/morikuni/aec"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

+ 3 - 3
cmd/compose/config.go

@@ -30,12 +30,12 @@ import (
 	"github.com/compose-spec/compose-go/v2/template"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/formatter"
+	"github.com/docker/compose/v5/cmd/formatter"
 	"github.com/spf13/cobra"
 	"gopkg.in/yaml.v3"
 
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 )
 
 type configOptions struct {

+ 2 - 2
cmd/compose/cp.go

@@ -22,10 +22,10 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type copyOptions struct {

+ 2 - 2
cmd/compose/create.go

@@ -26,12 +26,12 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type createOptions struct {

+ 3 - 3
cmd/compose/down.go

@@ -23,13 +23,13 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/compose"
+	"github.com/docker/compose/v5/pkg/utils"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type downOptions struct {

+ 2 - 2
cmd/compose/events.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 
 	"github.com/spf13/cobra"
 )

+ 2 - 2
cmd/compose/exec.go

@@ -25,8 +25,8 @@ import (
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

+ 2 - 2
cmd/compose/export.go

@@ -20,10 +20,10 @@ import (
 	"context"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type exportOptions struct {

+ 2 - 2
cmd/compose/generate.go

@@ -22,8 +22,8 @@ import (
 	"os"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 3 - 3
cmd/compose/images.go

@@ -27,13 +27,13 @@ import (
 
 	"github.com/containerd/platforms"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type imageOptions struct {

+ 3 - 3
cmd/compose/kill.go

@@ -23,11 +23,11 @@ import (
 	"os"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
 type killOptions struct {

+ 3 - 3
cmd/compose/list.go

@@ -23,13 +23,13 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/compose"
 
 	"github.com/docker/cli/opts"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type lsOptions struct {

+ 3 - 3
cmd/compose/logs.go

@@ -21,11 +21,11 @@ import (
 	"errors"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type logsOptions struct {

+ 3 - 3
cmd/compose/options.go

@@ -30,9 +30,9 @@ import (
 	"github.com/compose-spec/compose-go/v2/template"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/display"
-	"github.com/docker/compose/v2/cmd/prompt"
-	"github.com/docker/compose/v2/internal/tracing"
+	"github.com/docker/compose/v5/cmd/display"
+	"github.com/docker/compose/v5/cmd/prompt"
+	"github.com/docker/compose/v5/internal/tracing"
 )
 
 func applyPlatforms(project *types.Project, buildForSinglePlatform bool) error {

+ 1 - 1
cmd/compose/options_test.go

@@ -28,7 +28,7 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/streams"
-	"github.com/docker/compose/v2/pkg/mocks"
+	"github.com/docker/compose/v5/pkg/mocks"
 	"github.com/stretchr/testify/require"
 	"go.uber.org/mock/gomock"
 )

+ 2 - 2
cmd/compose/pause.go

@@ -20,10 +20,10 @@ import (
 	"context"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type pauseOptions struct {

+ 2 - 2
cmd/compose/port.go

@@ -23,10 +23,10 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type portOptions struct {

+ 3 - 3
cmd/compose/ps.go

@@ -24,9 +24,9 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 
 	"github.com/docker/cli/cli/command"
 	cliformatter "github.com/docker/cli/cli/command/formatter"

+ 2 - 2
cmd/compose/publish.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"

+ 2 - 2
cmd/compose/pull.go

@@ -24,11 +24,11 @@ import (
 	"github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/morikuni/aec"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type pullOptions struct {

+ 2 - 2
cmd/compose/push.go

@@ -21,10 +21,10 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type pushOptions struct {

+ 2 - 2
cmd/compose/remove.go

@@ -22,8 +22,8 @@ import (
 	"fmt"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 2 - 2
cmd/compose/restart.go

@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type restartOptions struct {

+ 4 - 4
cmd/compose/run.go

@@ -25,8 +25,8 @@ import (
 	composecli "github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/dotenv"
 	"github.com/compose-spec/compose-go/v2/format"
-	"github.com/docker/compose/v2/cmd/display"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/display"
+	"github.com/docker/compose/v5/pkg/compose"
 	xprogress "github.com/moby/buildkit/util/progress/progressui"
 	"github.com/sirupsen/logrus"
 
@@ -38,8 +38,8 @@ import (
 	"github.com/spf13/pflag"
 
 	"github.com/docker/cli/cli"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
 type runOptions struct {

+ 2 - 2
cmd/compose/scale.go

@@ -26,8 +26,8 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 2 - 2
cmd/compose/start.go

@@ -20,8 +20,8 @@ import (
 	"context"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 1 - 1
cmd/compose/stats.go

@@ -25,7 +25,7 @@ import (
 	"github.com/docker/docker/api/types/filters"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type statsOptions struct {

+ 2 - 2
cmd/compose/stop.go

@@ -21,10 +21,10 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type stopOptions struct {

+ 2 - 2
cmd/compose/top.go

@@ -25,10 +25,10 @@ import (
 	"text/tabwriter"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type topOptions struct {

+ 1 - 1
cmd/compose/top_test.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

+ 5 - 5
cmd/compose/up.go

@@ -26,16 +26,16 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/display"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/display"
+	"github.com/docker/compose/v5/pkg/compose"
 	xprogress "github.com/moby/buildkit/util/progress/progressui"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
 // composeOptions hold options common to `up` and `run` to run compose project

+ 2 - 2
cmd/compose/version.go

@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/formatter"
+	"github.com/docker/compose/v5/cmd/formatter"
 
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/internal"
+	"github.com/docker/compose/v5/internal"
 )
 
 type versionOptions struct {

+ 2 - 2
cmd/compose/version_test.go

@@ -21,8 +21,8 @@ import (
 	"testing"
 
 	"github.com/docker/cli/cli/streams"
-	"github.com/docker/compose/v2/internal"
-	"github.com/docker/compose/v2/pkg/mocks"
+	"github.com/docker/compose/v5/internal"
+	"github.com/docker/compose/v5/pkg/mocks"
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 )

+ 2 - 2
cmd/compose/viz.go

@@ -23,8 +23,8 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 2 - 2
cmd/compose/volumes.go

@@ -24,8 +24,8 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/cli/cli/flags"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 2 - 2
cmd/compose/wait.go

@@ -22,8 +22,8 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/compose"
 	"github.com/spf13/cobra"
 )
 

+ 4 - 4
cmd/compose/watch.go

@@ -21,12 +21,12 @@ import (
 	"fmt"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/cmd/formatter"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/formatter"
+	"github.com/docker/compose/v5/pkg/compose"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/internal/locker"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/internal/locker"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

+ 1 - 1
cmd/display/json.go

@@ -22,7 +22,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func JSON(out io.Writer) api.EventProcessor {

+ 1 - 1
cmd/display/json_test.go

@@ -21,7 +21,7 @@ import (
 	"encoding/json"
 	"testing"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"gotest.tools/v3/assert"
 )
 

+ 1 - 1
cmd/display/plain.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"io"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func Plain(out io.Writer) api.EventProcessor {

+ 1 - 1
cmd/display/quiet.go

@@ -19,7 +19,7 @@ package display
 import (
 	"context"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func Quiet() api.EventProcessor {

+ 1 - 1
cmd/display/tty.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 
 	"github.com/buger/goterm"
 	"github.com/docker/go-units"

+ 1 - 1
cmd/formatter/container.go

@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"github.com/docker/cli/cli/command/formatter"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"

+ 1 - 1
cmd/formatter/formatter.go

@@ -22,7 +22,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 // Print prints formatted lists in different formats

+ 1 - 1
cmd/formatter/logs.go

@@ -26,7 +26,7 @@ import (
 	"time"
 
 	"github.com/buger/goterm"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/pkg/jsonmessage"
 )
 

+ 2 - 2
cmd/formatter/shortcut.go

@@ -28,8 +28,8 @@ import (
 
 	"github.com/buger/goterm"
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/internal/tracing"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/internal/tracing"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/eiannone/keyboard"
 	"github.com/skratchdot/open-golang/open"
 )

+ 6 - 6
cmd/main.go

@@ -23,15 +23,15 @@ import (
 	"github.com/docker/cli/cli-plugins/metadata"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/cmdtrace"
-	"github.com/docker/compose/v2/cmd/prompt"
+	"github.com/docker/compose/v5/cmd/cmdtrace"
+	"github.com/docker/compose/v5/cmd/prompt"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 
-	"github.com/docker/compose/v2/cmd/compatibility"
-	commands "github.com/docker/compose/v2/cmd/compose"
-	"github.com/docker/compose/v2/internal"
-	"github.com/docker/compose/v2/pkg/compose"
+	"github.com/docker/compose/v5/cmd/compatibility"
+	commands "github.com/docker/compose/v5/cmd/compose"
+	"github.com/docker/compose/v5/internal"
+	"github.com/docker/compose/v5/pkg/compose"
 )
 
 func pluginMain() {

+ 2 - 2
cmd/prompt/prompt.go

@@ -22,10 +22,10 @@ import (
 
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/docker/cli/cli/streams"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
-//go:generate mockgen -destination=./prompt_mock.go -self_package "github.com/docker/compose/v2/pkg/prompt" -package=prompt . UI
+//go:generate mockgen -destination=./prompt_mock.go -self_package "github.com/docker/compose/v5/pkg/prompt" -package=prompt . UI
 
 // UI - prompt user input
 type UI interface {

+ 2 - 2
docs/sdk.md

@@ -30,8 +30,8 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/flags"
-    "github.com/docker/compose/v2/pkg/api"
-    "github.com/docker/compose/v2/pkg/compose"
+    "github.com/docker/compose/v5/pkg/api"
+    "github.com/docker/compose/v5/pkg/compose"
 )
 
 func main() {

+ 1 - 1
docs/yaml/main/generate.go

@@ -23,7 +23,7 @@ import (
 
 	clidocstool "github.com/docker/cli-docs-tool"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/cmd/compose"
+	"github.com/docker/compose/v5/cmd/compose"
 	"github.com/spf13/cobra"
 )
 

+ 1 - 1
go.mod

@@ -1,4 +1,4 @@
-module github.com/docker/compose/v2
+module github.com/docker/compose/v5
 
 go 1.24.9
 

+ 2 - 2
internal/desktop/client.go

@@ -25,8 +25,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/docker/compose/v2/internal"
-	"github.com/docker/compose/v2/internal/memnet"
+	"github.com/docker/compose/v5/internal"
+	"github.com/docker/compose/v5/internal/memnet"
 	"go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp"
 )
 

+ 1 - 1
internal/experimental/experimental.go

@@ -21,7 +21,7 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/docker/compose/v2/internal/desktop"
+	"github.com/docker/compose/v5/internal/desktop"
 )
 
 // envComposeExperimentalGlobal can be set to a falsy value (e.g. 0, false) to

+ 1 - 1
internal/oci/push.go

@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/containerd/v2/core/remotes"
 	pusherrors "github.com/containerd/containerd/v2/core/remotes/errors"
 	"github.com/distribution/reference"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/opencontainers/go-digest"
 	"github.com/opencontainers/image-spec/specs-go"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"

+ 1 - 1
internal/oci/resolver.go

@@ -29,7 +29,7 @@ import (
 	"github.com/containerd/errdefs"
 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli/config/configfile"
-	"github.com/docker/compose/v2/internal/registry"
+	"github.com/docker/compose/v5/internal/registry"
 	"github.com/moby/buildkit/util/contentutil"
 	spec "github.com/opencontainers/image-spec/specs-go/v1"
 )

+ 1 - 1
internal/tracing/docker_context.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/store"
-	"github.com/docker/compose/v2/internal/memnet"
+	"github.com/docker/compose/v5/internal/memnet"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace"
 	"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
 	"google.golang.org/grpc"

+ 1 - 1
internal/tracing/tracing.go

@@ -23,7 +23,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/docker/compose/v2/internal"
+	"github.com/docker/compose/v5/internal"
 	"go.opentelemetry.io/otel/attribute"
 
 	"github.com/docker/cli/cli/command"

+ 1 - 1
internal/tracing/tracing_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/docker/cli/cli/context/store"
 	"github.com/stretchr/testify/require"
 
-	"github.com/docker/compose/v2/internal/tracing"
+	"github.com/docker/compose/v5/internal/tracing"
 )
 
 var testStoreCfg = store.NewConfig(

+ 1 - 1
pkg/api/labels.go

@@ -19,7 +19,7 @@ package api
 import (
 	"github.com/hashicorp/go-version"
 
-	"github.com/docker/compose/v2/internal"
+	"github.com/docker/compose/v5/internal"
 )
 
 const (

+ 1 - 1
pkg/api/labels_test.go

@@ -19,7 +19,7 @@ package api
 import (
 	"testing"
 
-	"github.com/docker/compose/v2/internal"
+	"github.com/docker/compose/v5/internal"
 	"github.com/hashicorp/go-version"
 	"gotest.tools/v3/assert"
 )

+ 2 - 2
pkg/bridge/convert.go

@@ -30,8 +30,8 @@ import (
 	"github.com/containerd/errdefs"
 	"github.com/docker/cli/cli/command"
 	cli "github.com/docker/cli/cli/command/container"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/api/types/network"

+ 2 - 2
pkg/compose/attach.go

@@ -29,8 +29,8 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/moby/term"
 
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
 func (s *composeService) attach(ctx context.Context, project *types.Project, listener api.ContainerEventListener, selectedServices []string) (Containers, error) {

+ 1 - 1
pkg/compose/attach_service.go

@@ -21,7 +21,7 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command/container"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func (s *composeService) Attach(ctx context.Context, projectName string, options api.AttachOptions) error {

+ 3 - 3
pkg/compose/build.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/containerd/platforms"
-	"github.com/docker/compose/v2/internal/tracing"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/internal/tracing"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
 )

+ 1 - 1
pkg/compose/build_bake.go

@@ -39,7 +39,7 @@ import (
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/image/build"
 	"github.com/docker/cli/cli/streams"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/versions"
 	"github.com/google/uuid"
 	"github.com/moby/buildkit/client"

+ 1 - 1
pkg/compose/build_classic.go

@@ -29,7 +29,7 @@ import (
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command/image/build"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	buildtypes "github.com/docker/docker/api/types/build"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/registry"

+ 1 - 1
pkg/compose/commit.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/container"
 )
 

+ 2 - 2
pkg/compose/compose.go

@@ -31,7 +31,7 @@ import (
 	"github.com/docker/cli/cli/config/configfile"
 	"github.com/docker/cli/cli/flags"
 	"github.com/docker/cli/cli/streams"
-	"github.com/docker/compose/v2/pkg/dryrun"
+	"github.com/docker/compose/v5/pkg/dryrun"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/network"
@@ -41,7 +41,7 @@ import (
 	"github.com/jonboulle/clockwork"
 	"github.com/sirupsen/logrus"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type Option func(service *composeService) error

+ 1 - 1
pkg/compose/containers.go

@@ -24,7 +24,7 @@ import (
 	"strconv"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 )

+ 3 - 3
pkg/compose/convergence.go

@@ -39,9 +39,9 @@ import (
 	"go.opentelemetry.io/otel/trace"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/compose/v2/internal/tracing"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/internal/tracing"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 )
 
 const (

+ 2 - 2
pkg/compose/convergence_test.go

@@ -33,8 +33,8 @@ import (
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/mocks"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/mocks"
 )
 
 func TestContainerName(t *testing.T) {

+ 1 - 1
pkg/compose/cp.go

@@ -28,7 +28,7 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/container"
 	"github.com/moby/go-archive"
 )

+ 1 - 1
pkg/compose/create.go

@@ -42,7 +42,7 @@ import (
 	"github.com/sirupsen/logrus"
 	cdi "tags.cncf.io/container-device-interface/pkg/parser"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 type createOptions struct {

+ 1 - 1
pkg/compose/create_test.go

@@ -29,7 +29,7 @@ import (
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert/cmp"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/network"
 
 	composetypes "github.com/compose-spec/compose-go/v2/types"

+ 1 - 1
pkg/compose/dependencies.go

@@ -24,7 +24,7 @@ import (
 	"sync"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"golang.org/x/sync/errgroup"
 )
 

+ 1 - 1
pkg/compose/dependencies_test.go

@@ -24,7 +24,7 @@ import (
 	"testing"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/utils"
 	testify "github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"gotest.tools/v3/assert"

+ 2 - 2
pkg/compose/down.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/compose-spec/compose-go/v2/types"
 	"github.com/containerd/errdefs"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 	containerType "github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	imageapi "github.com/docker/docker/api/types/image"

+ 2 - 2
pkg/compose/down_test.go

@@ -34,8 +34,8 @@ import (
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
-	compose "github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/mocks"
+	compose "github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/mocks"
 )
 
 func TestDown(t *testing.T) {

+ 1 - 1
pkg/compose/events.go

@@ -25,7 +25,7 @@ import (
 	"github.com/docker/docker/api/types/events"
 	"github.com/docker/docker/api/types/filters"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func (s *composeService) Events(ctx context.Context, projectName string, options api.EventsOptions) error {

+ 1 - 1
pkg/compose/exec.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command/container"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	containerType "github.com/docker/docker/api/types/container"
 )
 

+ 1 - 1
pkg/compose/export.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/moby/sys/atomicwriter"
 )
 

+ 1 - 1
pkg/compose/filters.go

@@ -19,7 +19,7 @@ package compose
 import (
 	"fmt"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/filters"
 )
 

+ 1 - 1
pkg/compose/generate.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/api/types/mount"

+ 2 - 2
pkg/compose/hook.go

@@ -23,8 +23,8 @@ import (
 	"time"
 
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/utils"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/utils"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/stdcopy"
 )

+ 1 - 1
pkg/compose/image_pruner.go

@@ -30,7 +30,7 @@ import (
 	"github.com/docker/docker/client"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 // ImagePruneMode controls how aggressively images associated with the project

+ 1 - 1
pkg/compose/images.go

@@ -33,7 +33,7 @@ import (
 	"github.com/docker/docker/client"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func (s *composeService) Images(ctx context.Context, projectName string, options api.ImagesOptions) (map[string]api.ImageSummary, error) {

+ 1 - 1
pkg/compose/images_test.go

@@ -29,7 +29,7 @@ import (
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
-	compose "github.com/docker/compose/v2/pkg/api"
+	compose "github.com/docker/compose/v5/pkg/api"
 )
 
 func TestImages(t *testing.T) {

+ 1 - 1
pkg/compose/kill.go

@@ -23,7 +23,7 @@ import (
 	"github.com/docker/docker/api/types/container"
 	"golang.org/x/sync/errgroup"
 
-	"github.com/docker/compose/v2/pkg/api"
+	"github.com/docker/compose/v5/pkg/api"
 )
 
 func (s *composeService) Kill(ctx context.Context, projectName string, options api.KillOptions) error {

+ 1 - 1
pkg/compose/kill_test.go

@@ -30,7 +30,7 @@ import (
 	"go.uber.org/mock/gomock"
 	"gotest.tools/v3/assert"
 
-	compose "github.com/docker/compose/v2/pkg/api"
+	compose "github.com/docker/compose/v5/pkg/api"
 )
 
 const testProject = "testProject"

+ 2 - 2
pkg/compose/loader.go

@@ -25,8 +25,8 @@ import (
 	"github.com/compose-spec/compose-go/v2/cli"
 	"github.com/compose-spec/compose-go/v2/loader"
 	"github.com/compose-spec/compose-go/v2/types"
-	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/compose/v2/pkg/remote"
+	"github.com/docker/compose/v5/pkg/api"
+	"github.com/docker/compose/v5/pkg/remote"
 )
 
 // LoadProject implements api.Compose.LoadProject

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików