From 2b4543935c092f2a9178121bc56e7b86c6b36bf6 Mon Sep 17 00:00:00 2001 From: Nicolas De Loof Date: Thu, 13 Nov 2025 07:30:15 +0100 Subject: [PATCH] next release will be major version v5.x Signed-off-by: Nicolas De Loof --- Makefile | 2 +- README.md | 4 ++-- cmd/cmdtrace/cmd_span.go | 4 ++-- cmd/cmdtrace/cmd_span_test.go | 2 +- cmd/compatibility/convert.go | 2 +- cmd/compose/attach.go | 4 ++-- cmd/compose/bridge.go | 6 +++--- cmd/compose/build.go | 6 +++--- cmd/compose/commit.go | 4 ++-- cmd/compose/completion.go | 4 ++-- cmd/compose/compose.go | 14 +++++++------- cmd/compose/config.go | 6 +++--- cmd/compose/cp.go | 4 ++-- cmd/compose/create.go | 4 ++-- cmd/compose/down.go | 6 +++--- cmd/compose/events.go | 4 ++-- cmd/compose/exec.go | 4 ++-- cmd/compose/export.go | 4 ++-- cmd/compose/generate.go | 4 ++-- cmd/compose/images.go | 6 +++--- cmd/compose/kill.go | 6 +++--- cmd/compose/list.go | 6 +++--- cmd/compose/logs.go | 6 +++--- cmd/compose/options.go | 6 +++--- cmd/compose/options_test.go | 2 +- cmd/compose/pause.go | 4 ++-- cmd/compose/port.go | 4 ++-- cmd/compose/ps.go | 6 +++--- cmd/compose/publish.go | 4 ++-- cmd/compose/pull.go | 4 ++-- cmd/compose/push.go | 4 ++-- cmd/compose/remove.go | 4 ++-- cmd/compose/restart.go | 4 ++-- cmd/compose/run.go | 8 ++++---- cmd/compose/scale.go | 4 ++-- cmd/compose/start.go | 4 ++-- cmd/compose/stats.go | 2 +- cmd/compose/stop.go | 4 ++-- cmd/compose/top.go | 4 ++-- cmd/compose/top_test.go | 2 +- cmd/compose/up.go | 10 +++++----- cmd/compose/version.go | 4 ++-- cmd/compose/version_test.go | 4 ++-- cmd/compose/viz.go | 4 ++-- cmd/compose/volumes.go | 4 ++-- cmd/compose/wait.go | 4 ++-- cmd/compose/watch.go | 8 ++++---- cmd/display/json.go | 2 +- cmd/display/json_test.go | 2 +- cmd/display/plain.go | 2 +- cmd/display/quiet.go | 2 +- cmd/display/tty.go | 2 +- cmd/formatter/container.go | 2 +- cmd/formatter/formatter.go | 2 +- cmd/formatter/logs.go | 2 +- cmd/formatter/shortcut.go | 4 ++-- cmd/main.go | 12 ++++++------ cmd/prompt/prompt.go | 4 ++-- docs/sdk.md | 4 ++-- docs/yaml/main/generate.go | 2 +- go.mod | 2 +- internal/desktop/client.go | 4 ++-- internal/experimental/experimental.go | 2 +- internal/oci/push.go | 2 +- internal/oci/resolver.go | 2 +- internal/tracing/docker_context.go | 2 +- internal/tracing/tracing.go | 2 +- internal/tracing/tracing_test.go | 2 +- pkg/api/labels.go | 2 +- pkg/api/labels_test.go | 2 +- pkg/bridge/convert.go | 4 ++-- pkg/compose/attach.go | 4 ++-- pkg/compose/attach_service.go | 2 +- pkg/compose/build.go | 6 +++--- pkg/compose/build_bake.go | 2 +- pkg/compose/build_classic.go | 2 +- pkg/compose/commit.go | 2 +- pkg/compose/compose.go | 4 ++-- pkg/compose/containers.go | 2 +- pkg/compose/convergence.go | 6 +++--- pkg/compose/convergence_test.go | 4 ++-- pkg/compose/cp.go | 2 +- pkg/compose/create.go | 2 +- pkg/compose/create_test.go | 2 +- pkg/compose/dependencies.go | 2 +- pkg/compose/dependencies_test.go | 2 +- pkg/compose/down.go | 4 ++-- pkg/compose/down_test.go | 4 ++-- pkg/compose/events.go | 2 +- pkg/compose/exec.go | 2 +- pkg/compose/export.go | 2 +- pkg/compose/filters.go | 2 +- pkg/compose/generate.go | 2 +- pkg/compose/hook.go | 4 ++-- pkg/compose/image_pruner.go | 2 +- pkg/compose/images.go | 2 +- pkg/compose/images_test.go | 2 +- pkg/compose/kill.go | 2 +- pkg/compose/kill_test.go | 2 +- pkg/compose/loader.go | 4 ++-- pkg/compose/loader_test.go | 2 +- pkg/compose/logs.go | 4 ++-- pkg/compose/logs_test.go | 2 +- pkg/compose/ls.go | 2 +- pkg/compose/ls_test.go | 2 +- pkg/compose/model.go | 2 +- pkg/compose/monitor.go | 4 ++-- pkg/compose/pause.go | 2 +- pkg/compose/plugins.go | 2 +- pkg/compose/port.go | 2 +- pkg/compose/printer.go | 2 +- pkg/compose/progress.go | 2 +- pkg/compose/ps.go | 2 +- pkg/compose/ps_test.go | 2 +- pkg/compose/publish.go | 6 +++--- pkg/compose/publish_test.go | 4 ++-- pkg/compose/pull.go | 4 ++-- pkg/compose/push.go | 4 ++-- pkg/compose/remove.go | 2 +- pkg/compose/restart.go | 4 ++-- pkg/compose/run.go | 2 +- pkg/compose/scale.go | 4 ++-- pkg/compose/shellout.go | 2 +- pkg/compose/start.go | 2 +- pkg/compose/stop.go | 2 +- pkg/compose/stop_test.go | 4 ++-- pkg/compose/top.go | 2 +- pkg/compose/up.go | 6 +++--- pkg/compose/viz.go | 2 +- pkg/compose/viz_test.go | 4 ++-- pkg/compose/volumes.go | 2 +- pkg/compose/volumes_test.go | 2 +- pkg/compose/wait.go | 2 +- pkg/compose/watch.go | 12 ++++++------ pkg/compose/watch_test.go | 8 ++++---- pkg/e2e/cancel_test.go | 2 +- pkg/e2e/framework.go | 2 +- pkg/e2e/ps_test.go | 2 +- pkg/e2e/up_test.go | 2 +- pkg/mocks/mock_docker_compose_api.go | 2 +- pkg/remote/git.go | 2 +- pkg/remote/oci.go | 4 ++-- pkg/watch/debounce.go | 2 +- pkg/watch/dockerignore.go | 2 +- pkg/watch/ephemeral_test.go | 2 +- pkg/watch/watcher_darwin.go | 2 +- pkg/watch/watcher_naive.go | 2 +- 147 files changed, 253 insertions(+), 253 deletions(-) diff --git a/Makefile b/Makefile index 34004f111..19c88a1ab 100644 --- a/Makefile +++ b/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} diff --git a/README.md b/README.md index 58bbdb463..45f900d3d 100644 --- a/README.md +++ b/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") diff --git a/cmd/cmdtrace/cmd_span.go b/cmd/cmdtrace/cmd_span.go index e75056c29..365f95f7c 100644 --- a/cmd/cmdtrace/cmd_span.go +++ b/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" diff --git a/cmd/cmdtrace/cmd_span_test.go b/cmd/cmdtrace/cmd_span_test.go index 75073307c..0a3c8efec 100644 --- a/cmd/cmdtrace/cmd_span_test.go +++ b/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" ) diff --git a/cmd/compatibility/convert.go b/cmd/compatibility/convert.go index ba1ab8f3a..78d9b8303 100644 --- a/cmd/compatibility/convert.go +++ b/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 { diff --git a/cmd/compose/attach.go b/cmd/compose/attach.go index 49878cb2e..bef1b4657 100644 --- a/cmd/compose/attach.go +++ b/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" ) diff --git a/cmd/compose/bridge.go b/cmd/compose/bridge.go index bd0d11b2a..fcc780844 100644 --- a/cmd/compose/bridge.go +++ b/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 { diff --git a/cmd/compose/build.go b/cmd/compose/build.go index 5a86cc118..0a710a9ea 100644 --- a/cmd/compose/build.go +++ b/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 { diff --git a/cmd/compose/commit.go b/cmd/compose/commit.go index 909c0c84b..ede09dc95 100644 --- a/cmd/compose/commit.go +++ b/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" ) diff --git a/cmd/compose/completion.go b/cmd/compose/completion.go index 9f206bde5..14266a490 100644 --- a/cmd/compose/completion.go +++ b/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" ) diff --git a/cmd/compose/compose.go b/cmd/compose/compose.go index 4e9e5f175..fef0ed45f 100644 --- a/cmd/compose/compose.go +++ b/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" diff --git a/cmd/compose/config.go b/cmd/compose/config.go index 795d73c18..14d4d47b9 100644 --- a/cmd/compose/config.go +++ b/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 { diff --git a/cmd/compose/cp.go b/cmd/compose/cp.go index cfd6bb694..05e612366 100644 --- a/cmd/compose/cp.go +++ b/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 { diff --git a/cmd/compose/create.go b/cmd/compose/create.go index aa7175b1e..481fe3277 100644 --- a/cmd/compose/create.go +++ b/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 { diff --git a/cmd/compose/down.go b/cmd/compose/down.go index 324adec7f..8a3df4839 100644 --- a/cmd/compose/down.go +++ b/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 { diff --git a/cmd/compose/events.go b/cmd/compose/events.go index 4dac5b878..fb333e62e 100644 --- a/cmd/compose/events.go +++ b/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" ) diff --git a/cmd/compose/exec.go b/cmd/compose/exec.go index 077ec9f5b..761a7b6da 100644 --- a/cmd/compose/exec.go +++ b/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" diff --git a/cmd/compose/export.go b/cmd/compose/export.go index bde78b9b0..5cafa7fd9 100644 --- a/cmd/compose/export.go +++ b/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 { diff --git a/cmd/compose/generate.go b/cmd/compose/generate.go index 68597a435..b6e27a358 100644 --- a/cmd/compose/generate.go +++ b/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" ) diff --git a/cmd/compose/images.go b/cmd/compose/images.go index 79d67c755..3a5a92f79 100644 --- a/cmd/compose/images.go +++ b/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 { diff --git a/cmd/compose/kill.go b/cmd/compose/kill.go index 5b8febc29..8c8a0a27b 100644 --- a/cmd/compose/kill.go +++ b/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 { diff --git a/cmd/compose/list.go b/cmd/compose/list.go index 7357c86d7..d7ce49b9a 100644 --- a/cmd/compose/list.go +++ b/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 { diff --git a/cmd/compose/logs.go b/cmd/compose/logs.go index 0a31f1f82..185b82a14 100644 --- a/cmd/compose/logs.go +++ b/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 { diff --git a/cmd/compose/options.go b/cmd/compose/options.go index ff7ec1d29..f243bd6f5 100644 --- a/cmd/compose/options.go +++ b/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 { diff --git a/cmd/compose/options_test.go b/cmd/compose/options_test.go index 035d1820e..cac2f8302 100644 --- a/cmd/compose/options_test.go +++ b/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" ) diff --git a/cmd/compose/pause.go b/cmd/compose/pause.go index e1ccb2c22..b7e00b780 100644 --- a/cmd/compose/pause.go +++ b/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 { diff --git a/cmd/compose/port.go b/cmd/compose/port.go index c470f60f4..a117926fd 100644 --- a/cmd/compose/port.go +++ b/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 { diff --git a/cmd/compose/ps.go b/cmd/compose/ps.go index 47646f735..405977416 100644 --- a/cmd/compose/ps.go +++ b/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" diff --git a/cmd/compose/publish.go b/cmd/compose/publish.go index b0556b4ed..45d5caf7b 100644 --- a/cmd/compose/publish.go +++ b/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" diff --git a/cmd/compose/pull.go b/cmd/compose/pull.go index 4e4e58b48..c3ec6d522 100644 --- a/cmd/compose/pull.go +++ b/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 { diff --git a/cmd/compose/push.go b/cmd/compose/push.go index c76d1eca0..39d85f8a8 100644 --- a/cmd/compose/push.go +++ b/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 { diff --git a/cmd/compose/remove.go b/cmd/compose/remove.go index e3f2990db..6501afb9f 100644 --- a/cmd/compose/remove.go +++ b/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" ) diff --git a/cmd/compose/restart.go b/cmd/compose/restart.go index 7356cb68e..a2880d3c8 100644 --- a/cmd/compose/restart.go +++ b/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 { diff --git a/cmd/compose/run.go b/cmd/compose/run.go index d0d4d9144..e086a1f55 100644 --- a/cmd/compose/run.go +++ b/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 { diff --git a/cmd/compose/scale.go b/cmd/compose/scale.go index df9030ae0..40baeae34 100644 --- a/cmd/compose/scale.go +++ b/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" ) diff --git a/cmd/compose/start.go b/cmd/compose/start.go index f6af2927e..3ef92dc97 100644 --- a/cmd/compose/start.go +++ b/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" ) diff --git a/cmd/compose/stats.go b/cmd/compose/stats.go index 98d5aa63a..cef2daf27 100644 --- a/cmd/compose/stats.go +++ b/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 { diff --git a/cmd/compose/stop.go b/cmd/compose/stop.go index 84730ed54..67f299e04 100644 --- a/cmd/compose/stop.go +++ b/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 { diff --git a/cmd/compose/top.go b/cmd/compose/top.go index dab8bb4c1..b1b9ae42a 100644 --- a/cmd/compose/top.go +++ b/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 { diff --git a/cmd/compose/top_test.go b/cmd/compose/top_test.go index 3567c51c7..369dfa19c 100644 --- a/cmd/compose/top_test.go +++ b/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" ) diff --git a/cmd/compose/up.go b/cmd/compose/up.go index a65cab70a..7b9807c99 100644 --- a/cmd/compose/up.go +++ b/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 diff --git a/cmd/compose/version.go b/cmd/compose/version.go index e2bcc2120..86afcd189 100644 --- a/cmd/compose/version.go +++ b/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 { diff --git a/cmd/compose/version_test.go b/cmd/compose/version_test.go index ff971350a..cedaf63c4 100644 --- a/cmd/compose/version_test.go +++ b/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" ) diff --git a/cmd/compose/viz.go b/cmd/compose/viz.go index f55d12f3f..a3e54883d 100644 --- a/cmd/compose/viz.go +++ b/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" ) diff --git a/cmd/compose/volumes.go b/cmd/compose/volumes.go index c20925b58..eae4dbcbc 100644 --- a/cmd/compose/volumes.go +++ b/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" ) diff --git a/cmd/compose/wait.go b/cmd/compose/wait.go index 2ec21a078..f8b30f693 100644 --- a/cmd/compose/wait.go +++ b/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" ) diff --git a/cmd/compose/watch.go b/cmd/compose/watch.go index f328ec535..b77617e4c 100644 --- a/cmd/compose/watch.go +++ b/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" ) diff --git a/cmd/display/json.go b/cmd/display/json.go index 9f5946cd1..b88735963 100644 --- a/cmd/display/json.go +++ b/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 { diff --git a/cmd/display/json_test.go b/cmd/display/json_test.go index 15d2180c2..26895dc10 100644 --- a/cmd/display/json_test.go +++ b/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" ) diff --git a/cmd/display/plain.go b/cmd/display/plain.go index 39c0f323b..16f2816c0 100644 --- a/cmd/display/plain.go +++ b/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 { diff --git a/cmd/display/quiet.go b/cmd/display/quiet.go index c8459ae5b..8e1537d80 100644 --- a/cmd/display/quiet.go +++ b/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 { diff --git a/cmd/display/tty.go b/cmd/display/tty.go index e4bafca22..0cb151930 100644 --- a/cmd/display/tty.go +++ b/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" diff --git a/cmd/formatter/container.go b/cmd/formatter/container.go index e8e331b80..074ef00c1 100644 --- a/cmd/formatter/container.go +++ b/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" diff --git a/cmd/formatter/formatter.go b/cmd/formatter/formatter.go index 7330c578f..265eff8c5 100644 --- a/cmd/formatter/formatter.go +++ b/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 diff --git a/cmd/formatter/logs.go b/cmd/formatter/logs.go index 430cf1b03..949ef8a84 100644 --- a/cmd/formatter/logs.go +++ b/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" ) diff --git a/cmd/formatter/shortcut.go b/cmd/formatter/shortcut.go index 206632a4f..bb814cfa5 100644 --- a/cmd/formatter/shortcut.go +++ b/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" ) diff --git a/cmd/main.go b/cmd/main.go index bd102d6d9..c5afdb533 100644 --- a/cmd/main.go +++ b/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() { diff --git a/cmd/prompt/prompt.go b/cmd/prompt/prompt.go index 07dbbcb42..722ba64b0 100644 --- a/cmd/prompt/prompt.go +++ b/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 { diff --git a/docs/sdk.md b/docs/sdk.md index f54b3673e..3490a8198 100644 --- a/docs/sdk.md +++ b/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() { diff --git a/docs/yaml/main/generate.go b/docs/yaml/main/generate.go index 090861683..272727b00 100644 --- a/docs/yaml/main/generate.go +++ b/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" ) diff --git a/go.mod b/go.mod index 4596fd318..af5d5a7ad 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/docker/compose/v2 +module github.com/docker/compose/v5 go 1.24.9 diff --git a/internal/desktop/client.go b/internal/desktop/client.go index ab7fa9081..f46a6443c 100644 --- a/internal/desktop/client.go +++ b/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" ) diff --git a/internal/experimental/experimental.go b/internal/experimental/experimental.go index 0dff467ae..d63780243 100644 --- a/internal/experimental/experimental.go +++ b/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 diff --git a/internal/oci/push.go b/internal/oci/push.go index caa63881c..fe3ca5866 100644 --- a/internal/oci/push.go +++ b/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" diff --git a/internal/oci/resolver.go b/internal/oci/resolver.go index 7d2f663b3..6277ab61b 100644 --- a/internal/oci/resolver.go +++ b/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" ) diff --git a/internal/tracing/docker_context.go b/internal/tracing/docker_context.go index 25e015fce..75f988d19 100644 --- a/internal/tracing/docker_context.go +++ b/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" diff --git a/internal/tracing/tracing.go b/internal/tracing/tracing.go index 126dd42a1..cab8ee3b2 100644 --- a/internal/tracing/tracing.go +++ b/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" diff --git a/internal/tracing/tracing_test.go b/internal/tracing/tracing_test.go index 5c17824b2..557f13b47 100644 --- a/internal/tracing/tracing_test.go +++ b/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( diff --git a/pkg/api/labels.go b/pkg/api/labels.go index 5f011ca03..3a0f684b9 100644 --- a/pkg/api/labels.go +++ b/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 ( diff --git a/pkg/api/labels_test.go b/pkg/api/labels_test.go index 91df1a410..61b2d8b61 100644 --- a/pkg/api/labels_test.go +++ b/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" ) diff --git a/pkg/bridge/convert.go b/pkg/bridge/convert.go index 8e9995b82..c74dbbfac 100644 --- a/pkg/bridge/convert.go +++ b/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" diff --git a/pkg/compose/attach.go b/pkg/compose/attach.go index 6886ce821..47b5888ff 100644 --- a/pkg/compose/attach.go +++ b/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) { diff --git a/pkg/compose/attach_service.go b/pkg/compose/attach_service.go index 5d4321a10..7f41e773a 100644 --- a/pkg/compose/attach_service.go +++ b/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 { diff --git a/pkg/compose/build.go b/pkg/compose/build.go index d6edb2653..361ae5323 100644 --- a/pkg/compose/build.go +++ b/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" ) diff --git a/pkg/compose/build_bake.go b/pkg/compose/build_bake.go index cccf7a3c9..104be5c0f 100644 --- a/pkg/compose/build_bake.go +++ b/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" diff --git a/pkg/compose/build_classic.go b/pkg/compose/build_classic.go index 9161dc201..2157ffdec 100644 --- a/pkg/compose/build_classic.go +++ b/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" diff --git a/pkg/compose/commit.go b/pkg/compose/commit.go index db69a06bb..f50e8fc22 100644 --- a/pkg/compose/commit.go +++ b/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" ) diff --git a/pkg/compose/compose.go b/pkg/compose/compose.go index 228d3a66d..e303abba4 100644 --- a/pkg/compose/compose.go +++ b/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 diff --git a/pkg/compose/containers.go b/pkg/compose/containers.go index 1403e43d9..fddf8057d 100644 --- a/pkg/compose/containers.go +++ b/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" ) diff --git a/pkg/compose/convergence.go b/pkg/compose/convergence.go index 245c1ed81..701d00582 100644 --- a/pkg/compose/convergence.go +++ b/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 ( diff --git a/pkg/compose/convergence_test.go b/pkg/compose/convergence_test.go index e1d32dcb3..637be0296 100644 --- a/pkg/compose/convergence_test.go +++ b/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) { diff --git a/pkg/compose/cp.go b/pkg/compose/cp.go index 0aafc1db0..f236a2a1a 100644 --- a/pkg/compose/cp.go +++ b/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" ) diff --git a/pkg/compose/create.go b/pkg/compose/create.go index 1aabedb76..59dc56871 100644 --- a/pkg/compose/create.go +++ b/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 { diff --git a/pkg/compose/create_test.go b/pkg/compose/create_test.go index 3394bf3c9..d6470abe2 100644 --- a/pkg/compose/create_test.go +++ b/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" diff --git a/pkg/compose/dependencies.go b/pkg/compose/dependencies.go index 812e45c98..c5d3b35da 100644 --- a/pkg/compose/dependencies.go +++ b/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" ) diff --git a/pkg/compose/dependencies_test.go b/pkg/compose/dependencies_test.go index 4c370fe19..904d975fb 100644 --- a/pkg/compose/dependencies_test.go +++ b/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" diff --git a/pkg/compose/down.go b/pkg/compose/down.go index 3572c09d6..4d57bcfed 100644 --- a/pkg/compose/down.go +++ b/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" diff --git a/pkg/compose/down_test.go b/pkg/compose/down_test.go index e9aba1d3b..896661750 100644 --- a/pkg/compose/down_test.go +++ b/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) { diff --git a/pkg/compose/events.go b/pkg/compose/events.go index 7ea8dc326..af75bd7c5 100644 --- a/pkg/compose/events.go +++ b/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 { diff --git a/pkg/compose/exec.go b/pkg/compose/exec.go index a57e29e4e..b1f4666f3 100644 --- a/pkg/compose/exec.go +++ b/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" ) diff --git a/pkg/compose/export.go b/pkg/compose/export.go index 28af3261d..65dd31cd1 100644 --- a/pkg/compose/export.go +++ b/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" ) diff --git a/pkg/compose/filters.go b/pkg/compose/filters.go index d6c814977..794803160 100644 --- a/pkg/compose/filters.go +++ b/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" ) diff --git a/pkg/compose/generate.go b/pkg/compose/generate.go index 025d5093d..07999fd4c 100644 --- a/pkg/compose/generate.go +++ b/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" diff --git a/pkg/compose/hook.go b/pkg/compose/hook.go index dd02de640..57c961c06 100644 --- a/pkg/compose/hook.go +++ b/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" ) diff --git a/pkg/compose/image_pruner.go b/pkg/compose/image_pruner.go index bb4d0bc47..6e09d9014 100644 --- a/pkg/compose/image_pruner.go +++ b/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 diff --git a/pkg/compose/images.go b/pkg/compose/images.go index d49e92c65..c4632635b 100644 --- a/pkg/compose/images.go +++ b/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) { diff --git a/pkg/compose/images_test.go b/pkg/compose/images_test.go index 80006a481..91e649bc2 100644 --- a/pkg/compose/images_test.go +++ b/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) { diff --git a/pkg/compose/kill.go b/pkg/compose/kill.go index c25838579..63d369902 100644 --- a/pkg/compose/kill.go +++ b/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 { diff --git a/pkg/compose/kill_test.go b/pkg/compose/kill_test.go index b45bb924c..b25dc48e6 100644 --- a/pkg/compose/kill_test.go +++ b/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" diff --git a/pkg/compose/loader.go b/pkg/compose/loader.go index 69840ff1a..41d414089 100644 --- a/pkg/compose/loader.go +++ b/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 diff --git a/pkg/compose/loader_test.go b/pkg/compose/loader_test.go index d5c345ad2..cdaa1ad68 100644 --- a/pkg/compose/loader_test.go +++ b/pkg/compose/loader_test.go @@ -23,7 +23,7 @@ import ( "testing" "github.com/compose-spec/compose-go/v2/cli" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/pkg/compose/logs.go b/pkg/compose/logs.go index b4479d758..c633f5c31 100644 --- a/pkg/compose/logs.go +++ b/pkg/compose/logs.go @@ -26,8 +26,8 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" - "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) Logs( diff --git a/pkg/compose/logs_test.go b/pkg/compose/logs_test.go index 8c6802dce..d2292a753 100644 --- a/pkg/compose/logs_test.go +++ b/pkg/compose/logs_test.go @@ -31,7 +31,7 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - compose "github.com/docker/compose/v2/pkg/api" + compose "github.com/docker/compose/v5/pkg/api" ) func TestComposeService_Logs_Demux(t *testing.T) { diff --git a/pkg/compose/ls.go b/pkg/compose/ls.go index 403b061a8..f4fab837f 100644 --- a/pkg/compose/ls.go +++ b/pkg/compose/ls.go @@ -23,7 +23,7 @@ import ( "sort" "strings" - "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/sirupsen/logrus" diff --git a/pkg/compose/ls_test.go b/pkg/compose/ls_test.go index 847814c6f..d3505a63a 100644 --- a/pkg/compose/ls_test.go +++ b/pkg/compose/ls_test.go @@ -20,7 +20,7 @@ import ( "fmt" "testing" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "github.com/docker/docker/api/types/container" "gotest.tools/v3/assert" diff --git a/pkg/compose/model.go b/pkg/compose/model.go index 7e6f36a64..10af13875 100644 --- a/pkg/compose/model.go +++ b/pkg/compose/model.go @@ -29,7 +29,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" "github.com/docker/cli/cli-plugins/manager" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "github.com/spf13/cobra" "golang.org/x/sync/errgroup" ) diff --git a/pkg/compose/monitor.go b/pkg/compose/monitor.go index daeb64c80..e7e70c883 100644 --- a/pkg/compose/monitor.go +++ b/pkg/compose/monitor.go @@ -27,8 +27,8 @@ import ( "github.com/docker/docker/client" "github.com/sirupsen/logrus" - "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 monitor struct { diff --git a/pkg/compose/pause.go b/pkg/compose/pause.go index 882dcb660..35d476eea 100644 --- a/pkg/compose/pause.go +++ b/pkg/compose/pause.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) Pause(ctx context.Context, projectName string, options api.PauseOptions) error { diff --git a/pkg/compose/plugins.go b/pkg/compose/plugins.go index e872528fb..98bec3579 100644 --- a/pkg/compose/plugins.go +++ b/pkg/compose/plugins.go @@ -33,7 +33,7 @@ import ( "github.com/containerd/errdefs" "github.com/docker/cli/cli-plugins/manager" "github.com/docker/cli/cli/config" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/pkg/compose/port.go b/pkg/compose/port.go index 35c2832ac..350369e6c 100644 --- a/pkg/compose/port.go +++ b/pkg/compose/port.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" ) diff --git a/pkg/compose/printer.go b/pkg/compose/printer.go index 9e1dd0150..6fe6b9fda 100644 --- a/pkg/compose/printer.go +++ b/pkg/compose/printer.go @@ -19,7 +19,7 @@ package compose import ( "fmt" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" ) // logPrinter watch application containers and collect their logs diff --git a/pkg/compose/progress.go b/pkg/compose/progress.go index a958c83a8..26f9b5d85 100644 --- a/pkg/compose/progress.go +++ b/pkg/compose/progress.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" ) type progressFunc func(context.Context) error diff --git a/pkg/compose/ps.go b/pkg/compose/ps.go index 42dfd272b..fb32358ae 100644 --- a/pkg/compose/ps.go +++ b/pkg/compose/ps.go @@ -24,7 +24,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) Ps(ctx context.Context, projectName string, options api.PsOptions) ([]api.ContainerSummary, error) { diff --git a/pkg/compose/ps_test.go b/pkg/compose/ps_test.go index 9a62d3461..c76bfdfd2 100644 --- a/pkg/compose/ps_test.go +++ b/pkg/compose/ps_test.go @@ -26,7 +26,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 TestPs(t *testing.T) { diff --git a/pkg/compose/publish.go b/pkg/compose/publish.go index 4e084eb2a..0163e5286 100644 --- a/pkg/compose/publish.go +++ b/pkg/compose/publish.go @@ -32,9 +32,9 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/types" "github.com/distribution/reference" - "github.com/docker/compose/v2/internal/oci" - "github.com/docker/compose/v2/pkg/api" - "github.com/docker/compose/v2/pkg/compose/transform" + "github.com/docker/compose/v5/internal/oci" + "github.com/docker/compose/v5/pkg/api" + "github.com/docker/compose/v5/pkg/compose/transform" "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/specs-go" v1 "github.com/opencontainers/image-spec/specs-go/v1" diff --git a/pkg/compose/publish_test.go b/pkg/compose/publish_test.go index e8901c826..03170a08f 100644 --- a/pkg/compose/publish_test.go +++ b/pkg/compose/publish_test.go @@ -23,8 +23,8 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/compose/v2/internal" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/internal" + "github.com/docker/compose/v5/pkg/api" "github.com/google/go-cmp/cmp" v1 "github.com/opencontainers/image-spec/specs-go/v1" "gotest.tools/v3/assert" diff --git a/pkg/compose/pull.go b/pkg/compose/pull.go index e9a6385e1..194500c31 100644 --- a/pkg/compose/pull.go +++ b/pkg/compose/pull.go @@ -38,8 +38,8 @@ import ( "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" - "github.com/docker/compose/v2/internal/registry" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/internal/registry" + "github.com/docker/compose/v5/pkg/api" ) func (s *composeService) Pull(ctx context.Context, project *types.Project, options api.PullOptions) error { diff --git a/pkg/compose/push.go b/pkg/compose/push.go index 04b413fd9..abf945353 100644 --- a/pkg/compose/push.go +++ b/pkg/compose/push.go @@ -31,8 +31,8 @@ import ( "github.com/docker/docker/pkg/jsonmessage" "golang.org/x/sync/errgroup" - "github.com/docker/compose/v2/internal/registry" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/internal/registry" + "github.com/docker/compose/v5/pkg/api" ) func (s *composeService) Push(ctx context.Context, project *types.Project, options api.PushOptions) error { diff --git a/pkg/compose/remove.go b/pkg/compose/remove.go index e47ad058a..aee1b60d1 100644 --- a/pkg/compose/remove.go +++ b/pkg/compose/remove.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" "golang.org/x/sync/errgroup" ) diff --git a/pkg/compose/restart.go b/pkg/compose/restart.go index 905cfe44b..6b2458694 100644 --- a/pkg/compose/restart.go +++ b/pkg/compose/restart.go @@ -21,8 +21,8 @@ import ( "strings" "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" "golang.org/x/sync/errgroup" ) diff --git a/pkg/compose/run.go b/pkg/compose/run.go index f530a0aea..4b4eb53e8 100644 --- a/pkg/compose/run.go +++ b/pkg/compose/run.go @@ -27,7 +27,7 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/docker/cli/cli" cmd "github.com/docker/cli/cli/command/container" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "github.com/docker/docker/pkg/stringid" ) diff --git a/pkg/compose/scale.go b/pkg/compose/scale.go index 8b7acd3e3..5a773b312 100644 --- a/pkg/compose/scale.go +++ b/pkg/compose/scale.go @@ -19,8 +19,8 @@ import ( "context" "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" ) func (s *composeService) Scale(ctx context.Context, project *types.Project, options api.ScaleOptions) error { diff --git a/pkg/compose/shellout.go b/pkg/compose/shellout.go index b7b90c1d8..e7f928da2 100644 --- a/pkg/compose/shellout.go +++ b/pkg/compose/shellout.go @@ -26,7 +26,7 @@ import ( "github.com/docker/cli/cli-plugins/metadata" "github.com/docker/cli/cli/command" "github.com/docker/cli/cli/flags" - "github.com/docker/compose/v2/internal" + "github.com/docker/compose/v5/internal" "github.com/docker/docker/client" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/propagation" diff --git a/pkg/compose/start.go b/pkg/compose/start.go index ae9e0d557..608184ff2 100644 --- a/pkg/compose/start.go +++ b/pkg/compose/start.go @@ -22,7 +22,7 @@ import ( "fmt" "strings" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" containerType "github.com/docker/docker/api/types/container" "github.com/compose-spec/compose-go/v2/types" diff --git a/pkg/compose/stop.go b/pkg/compose/stop.go index 730073a71..79272513c 100644 --- a/pkg/compose/stop.go +++ b/pkg/compose/stop.go @@ -21,7 +21,7 @@ import ( "slices" "strings" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" ) func (s *composeService) Stop(ctx context.Context, projectName string, options api.StopOptions) error { diff --git a/pkg/compose/stop_test.go b/pkg/compose/stop_test.go index edc00e344..2508be06b 100644 --- a/pkg/compose/stop_test.go +++ b/pkg/compose/stop_test.go @@ -29,8 +29,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/utils" + compose "github.com/docker/compose/v5/pkg/api" + "github.com/docker/compose/v5/pkg/utils" ) func TestStopTimeout(t *testing.T) { diff --git a/pkg/compose/top.go b/pkg/compose/top.go index fac7f7cb8..5a766cbe0 100644 --- a/pkg/compose/top.go +++ b/pkg/compose/top.go @@ -20,7 +20,7 @@ import ( "context" "strings" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "golang.org/x/sync/errgroup" ) diff --git a/pkg/compose/up.go b/pkg/compose/up.go index 9e4da70a8..ad1630fc3 100644 --- a/pkg/compose/up.go +++ b/pkg/compose/up.go @@ -30,9 +30,9 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/containerd/errdefs" "github.com/docker/cli/cli" - "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/v5/cmd/formatter" + "github.com/docker/compose/v5/internal/tracing" + "github.com/docker/compose/v5/pkg/api" "github.com/eiannone/keyboard" "github.com/sirupsen/logrus" "golang.org/x/sync/errgroup" diff --git a/pkg/compose/viz.go b/pkg/compose/viz.go index 8b092adcc..18c1af779 100644 --- a/pkg/compose/viz.go +++ b/pkg/compose/viz.go @@ -22,7 +22,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" ) // maps a service with the services it depends on diff --git a/pkg/compose/viz_test.go b/pkg/compose/viz_test.go index a2a1d0e7e..ae66de34f 100644 --- a/pkg/compose/viz_test.go +++ b/pkg/compose/viz_test.go @@ -26,8 +26,8 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/mock/gomock" - 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 TestViz(t *testing.T) { diff --git a/pkg/compose/volumes.go b/pkg/compose/volumes.go index 0967a719d..03a12a268 100644 --- a/pkg/compose/volumes.go +++ b/pkg/compose/volumes.go @@ -20,7 +20,7 @@ import ( "context" "slices" - "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/volume" diff --git a/pkg/compose/volumes_test.go b/pkg/compose/volumes_test.go index ab0fbcc79..d60dc2144 100644 --- a/pkg/compose/volumes_test.go +++ b/pkg/compose/volumes_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "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/volume" diff --git a/pkg/compose/wait.go b/pkg/compose/wait.go index a2ee22948..003a1816e 100644 --- a/pkg/compose/wait.go +++ b/pkg/compose/wait.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" "golang.org/x/sync/errgroup" ) diff --git a/pkg/compose/watch.go b/pkg/compose/watch.go index c1cf675cb..e5625ed38 100644 --- a/pkg/compose/watch.go +++ b/pkg/compose/watch.go @@ -29,12 +29,12 @@ import ( gsync "sync" "time" - pathutil "github.com/docker/compose/v2/internal/paths" - "github.com/docker/compose/v2/internal/sync" - "github.com/docker/compose/v2/internal/tracing" - "github.com/docker/compose/v2/pkg/api" - cutils "github.com/docker/compose/v2/pkg/utils" - "github.com/docker/compose/v2/pkg/watch" + pathutil "github.com/docker/compose/v5/internal/paths" + "github.com/docker/compose/v5/internal/sync" + "github.com/docker/compose/v5/internal/tracing" + "github.com/docker/compose/v5/pkg/api" + cutils "github.com/docker/compose/v5/pkg/utils" + "github.com/docker/compose/v5/pkg/watch" "github.com/moby/buildkit/util/progress/progressui" "github.com/compose-spec/compose-go/v2/types" diff --git a/pkg/compose/watch_test.go b/pkg/compose/watch_test.go index c009fdfc0..d5d8cd081 100644 --- a/pkg/compose/watch_test.go +++ b/pkg/compose/watch_test.go @@ -23,10 +23,10 @@ import ( "github.com/compose-spec/compose-go/v2/types" "github.com/docker/cli/cli/streams" - "github.com/docker/compose/v2/internal/sync" - "github.com/docker/compose/v2/pkg/api" - "github.com/docker/compose/v2/pkg/mocks" - "github.com/docker/compose/v2/pkg/watch" + "github.com/docker/compose/v5/internal/sync" + "github.com/docker/compose/v5/pkg/api" + "github.com/docker/compose/v5/pkg/mocks" + "github.com/docker/compose/v5/pkg/watch" "github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/image" diff --git a/pkg/e2e/cancel_test.go b/pkg/e2e/cancel_test.go index a3f4b77cd..51c20062f 100644 --- a/pkg/e2e/cancel_test.go +++ b/pkg/e2e/cancel_test.go @@ -28,7 +28,7 @@ import ( "testing" "time" - "github.com/docker/compose/v2/pkg/utils" + "github.com/docker/compose/v5/pkg/utils" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" ) diff --git a/pkg/e2e/framework.go b/pkg/e2e/framework.go index 2a942d4f3..a4624d1de 100644 --- a/pkg/e2e/framework.go +++ b/pkg/e2e/framework.go @@ -36,7 +36,7 @@ import ( "gotest.tools/v3/icmd" "gotest.tools/v3/poll" - "github.com/docker/compose/v2/cmd/compose" + "github.com/docker/compose/v5/cmd/compose" ) var ( diff --git a/pkg/e2e/ps_test.go b/pkg/e2e/ps_test.go index ae227ead1..77a49accb 100644 --- a/pkg/e2e/ps_test.go +++ b/pkg/e2e/ps_test.go @@ -25,7 +25,7 @@ import ( "github.com/stretchr/testify/require" "gotest.tools/v3/icmd" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/pkg/api" ) func TestPs(t *testing.T) { diff --git a/pkg/e2e/up_test.go b/pkg/e2e/up_test.go index 36a1fc1f3..a13ff63da 100644 --- a/pkg/e2e/up_test.go +++ b/pkg/e2e/up_test.go @@ -29,7 +29,7 @@ import ( "testing" "time" - "github.com/docker/compose/v2/pkg/utils" + "github.com/docker/compose/v5/pkg/utils" "github.com/stretchr/testify/require" "gotest.tools/v3/assert" "gotest.tools/v3/icmd" diff --git a/pkg/mocks/mock_docker_compose_api.go b/pkg/mocks/mock_docker_compose_api.go index b3a34e26a..db6ddb92e 100644 --- a/pkg/mocks/mock_docker_compose_api.go +++ b/pkg/mocks/mock_docker_compose_api.go @@ -14,7 +14,7 @@ import ( reflect "reflect" types "github.com/compose-spec/compose-go/v2/types" - api "github.com/docker/compose/v2/pkg/api" + api "github.com/docker/compose/v5/pkg/api" gomock "go.uber.org/mock/gomock" ) diff --git a/pkg/remote/git.go b/pkg/remote/git.go index 3e01acd58..e49b40d83 100644 --- a/pkg/remote/git.go +++ b/pkg/remote/git.go @@ -32,7 +32,7 @@ import ( "github.com/compose-spec/compose-go/v2/loader" "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/v5/pkg/api" gitutil "github.com/moby/buildkit/frontend/dockerfile/dfgitutil" "github.com/sirupsen/logrus" ) diff --git a/pkg/remote/oci.go b/pkg/remote/oci.go index 95ddc7733..d74d70a09 100644 --- a/pkg/remote/oci.go +++ b/pkg/remote/oci.go @@ -30,8 +30,8 @@ import ( "github.com/containerd/containerd/v2/core/remotes" "github.com/distribution/reference" "github.com/docker/cli/cli/command" - "github.com/docker/compose/v2/internal/oci" - "github.com/docker/compose/v2/pkg/api" + "github.com/docker/compose/v5/internal/oci" + "github.com/docker/compose/v5/pkg/api" spec "github.com/opencontainers/image-spec/specs-go/v1" ) diff --git a/pkg/watch/debounce.go b/pkg/watch/debounce.go index 684054b5c..e14da149b 100644 --- a/pkg/watch/debounce.go +++ b/pkg/watch/debounce.go @@ -18,7 +18,7 @@ import ( "context" "time" - "github.com/docker/compose/v2/pkg/utils" + "github.com/docker/compose/v5/pkg/utils" "github.com/jonboulle/clockwork" "github.com/sirupsen/logrus" ) diff --git a/pkg/watch/dockerignore.go b/pkg/watch/dockerignore.go index c51b6fabf..5dd5f343f 100644 --- a/pkg/watch/dockerignore.go +++ b/pkg/watch/dockerignore.go @@ -25,7 +25,7 @@ import ( "strings" "github.com/compose-spec/compose-go/v2/types" - "github.com/docker/compose/v2/internal/paths" + "github.com/docker/compose/v5/internal/paths" "github.com/moby/patternmatcher" "github.com/moby/patternmatcher/ignorefile" ) diff --git a/pkg/watch/ephemeral_test.go b/pkg/watch/ephemeral_test.go index 4b314ac51..9f7b81819 100644 --- a/pkg/watch/ephemeral_test.go +++ b/pkg/watch/ephemeral_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/docker/compose/v2/pkg/watch" + "github.com/docker/compose/v5/pkg/watch" ) func TestEphemeralPathMatcher(t *testing.T) { diff --git a/pkg/watch/watcher_darwin.go b/pkg/watch/watcher_darwin.go index f440f501f..01c1fb6c9 100644 --- a/pkg/watch/watcher_darwin.go +++ b/pkg/watch/watcher_darwin.go @@ -25,7 +25,7 @@ import ( "path/filepath" "time" - pathutil "github.com/docker/compose/v2/internal/paths" + pathutil "github.com/docker/compose/v5/internal/paths" "github.com/fsnotify/fsevents" ) diff --git a/pkg/watch/watcher_naive.go b/pkg/watch/watcher_naive.go index 1e03b810c..555bb5596 100644 --- a/pkg/watch/watcher_naive.go +++ b/pkg/watch/watcher_naive.go @@ -27,7 +27,7 @@ import ( "runtime" "strings" - pathutil "github.com/docker/compose/v2/internal/paths" + pathutil "github.com/docker/compose/v5/internal/paths" "github.com/sirupsen/logrus" "github.com/tilt-dev/fsnotify" )