next release will be major version v5.x

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
This commit is contained in:
Nicolas De Loof 2025-11-13 07:30:15 +01:00 committed by Guillaume Lours
parent f0dce1b977
commit 2b4543935c
147 changed files with 253 additions and 253 deletions

View File

@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # 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) VERSION ?= $(shell git describe --match 'v[0-9]*' --dirty='.m' --always --tags)
GO_LDFLAGS ?= -w -X ${PKG}/internal.Version=${VERSION} GO_LDFLAGS ?= -w -X ${PKG}/internal.Version=${VERSION}

View File

@ -9,9 +9,9 @@
# Docker Compose v2 # 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) [![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) [![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) [![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) [![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") ![Docker Compose](logo.png?raw=true "Docker Compose Logo")

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -28,7 +28,7 @@ import (
"github.com/compose-spec/compose-go/v2/types" "github.com/compose-spec/compose-go/v2/types"
"github.com/docker/cli/cli/streams" "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" "github.com/stretchr/testify/require"
"go.uber.org/mock/gomock" "go.uber.org/mock/gomock"
) )

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -21,11 +21,11 @@ import (
"strings" "strings"
"github.com/docker/cli/cli/command" "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/spf13/cobra"
"github.com/docker/compose/v2/internal" "github.com/docker/compose/v5/internal"
) )
type versionOptions struct { type versionOptions struct {

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -23,7 +23,7 @@ import (
"time" "time"
"github.com/docker/cli/cli/command/formatter" "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/api/types/container"
"github.com/docker/docker/pkg/stringid" "github.com/docker/docker/pkg/stringid"
"github.com/docker/go-units" "github.com/docker/go-units"

View File

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

View File

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

View File

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

View File

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

View File

@ -22,10 +22,10 @@ import (
"github.com/AlecAivazis/survey/v2" "github.com/AlecAivazis/survey/v2"
"github.com/docker/cli/cli/streams" "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 // UI - prompt user input
type UI interface { type UI interface {

View File

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

View File

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

2
go.mod
View File

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

View File

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

View File

@ -21,7 +21,7 @@ import (
"os" "os"
"strconv" "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 // envComposeExperimentalGlobal can be set to a falsy value (e.g. 0, false) to

View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/containerd/v2/core/remotes" "github.com/containerd/containerd/v2/core/remotes"
pusherrors "github.com/containerd/containerd/v2/core/remotes/errors" pusherrors "github.com/containerd/containerd/v2/core/remotes/errors"
"github.com/distribution/reference" "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/go-digest"
"github.com/opencontainers/image-spec/specs-go" "github.com/opencontainers/image-spec/specs-go"
v1 "github.com/opencontainers/image-spec/specs-go/v1" v1 "github.com/opencontainers/image-spec/specs-go/v1"

View File

@ -29,7 +29,7 @@ import (
"github.com/containerd/errdefs" "github.com/containerd/errdefs"
"github.com/distribution/reference" "github.com/distribution/reference"
"github.com/docker/cli/cli/config/configfile" "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" "github.com/moby/buildkit/util/contentutil"
spec "github.com/opencontainers/image-spec/specs-go/v1" spec "github.com/opencontainers/image-spec/specs-go/v1"
) )

View File

@ -22,7 +22,7 @@ import (
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/context/store" "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"
"go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc" "go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc"
"google.golang.org/grpc" "google.golang.org/grpc"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -21,7 +21,7 @@ import (
"strings" "strings"
"github.com/docker/cli/cli/command/container" "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 { func (s *composeService) Attach(ctx context.Context, projectName string, options api.AttachOptions) error {

View File

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

View File

@ -39,7 +39,7 @@ import (
"github.com/docker/cli/cli/command" "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/command/image/build" "github.com/docker/cli/cli/command/image/build"
"github.com/docker/cli/cli/streams" "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/docker/docker/api/types/versions"
"github.com/google/uuid" "github.com/google/uuid"
"github.com/moby/buildkit/client" "github.com/moby/buildkit/client"

View File

@ -29,7 +29,7 @@ import (
"github.com/compose-spec/compose-go/v2/types" "github.com/compose-spec/compose-go/v2/types"
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command/image/build" "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" buildtypes "github.com/docker/docker/api/types/build"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/registry" "github.com/docker/docker/api/types/registry"

View File

@ -21,7 +21,7 @@ import (
"fmt" "fmt"
"strings" "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/container"
) )

View File

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

View File

@ -24,7 +24,7 @@ import (
"strconv" "strconv"
"github.com/compose-spec/compose-go/v2/types" "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/container"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
) )

View File

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

View File

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

View File

@ -28,7 +28,7 @@ import (
"golang.org/x/sync/errgroup" "golang.org/x/sync/errgroup"
"github.com/docker/cli/cli/command" "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/docker/docker/api/types/container"
"github.com/moby/go-archive" "github.com/moby/go-archive"
) )

View File

@ -42,7 +42,7 @@ import (
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
cdi "tags.cncf.io/container-device-interface/pkg/parser" 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 { type createOptions struct {

View File

@ -29,7 +29,7 @@ import (
"go.uber.org/mock/gomock" "go.uber.org/mock/gomock"
"gotest.tools/v3/assert/cmp" "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" "github.com/docker/docker/api/types/network"
composetypes "github.com/compose-spec/compose-go/v2/types" composetypes "github.com/compose-spec/compose-go/v2/types"

View File

@ -24,7 +24,7 @@ import (
"sync" "sync"
"github.com/compose-spec/compose-go/v2/types" "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" "golang.org/x/sync/errgroup"
) )

View File

@ -24,7 +24,7 @@ import (
"testing" "testing"
"github.com/compose-spec/compose-go/v2/types" "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" testify "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"gotest.tools/v3/assert" "gotest.tools/v3/assert"

View File

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

View File

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

View File

@ -25,7 +25,7 @@ import (
"github.com/docker/docker/api/types/events" "github.com/docker/docker/api/types/events"
"github.com/docker/docker/api/types/filters" "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 { func (s *composeService) Events(ctx context.Context, projectName string, options api.EventsOptions) error {

View File

@ -23,7 +23,7 @@ import (
"github.com/docker/cli/cli" "github.com/docker/cli/cli"
"github.com/docker/cli/cli/command/container" "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" containerType "github.com/docker/docker/api/types/container"
) )

View File

@ -23,7 +23,7 @@ import (
"strings" "strings"
"github.com/docker/cli/cli/command" "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" "github.com/moby/sys/atomicwriter"
) )

View File

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

View File

@ -24,7 +24,7 @@ import (
"strings" "strings"
"github.com/compose-spec/compose-go/v2/types" "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/container"
"github.com/docker/docker/api/types/filters" "github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/mount" "github.com/docker/docker/api/types/mount"

View File

@ -23,8 +23,8 @@ import (
"time" "time"
"github.com/compose-spec/compose-go/v2/types" "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/compose/v2/pkg/utils" "github.com/docker/compose/v5/pkg/utils"
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"github.com/docker/docker/pkg/stdcopy" "github.com/docker/docker/pkg/stdcopy"
) )

View File

@ -30,7 +30,7 @@ import (
"github.com/docker/docker/client" "github.com/docker/docker/client"
"golang.org/x/sync/errgroup" "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 // ImagePruneMode controls how aggressively images associated with the project

View File

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

View File

@ -29,7 +29,7 @@ import (
"go.uber.org/mock/gomock" "go.uber.org/mock/gomock"
"gotest.tools/v3/assert" "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) { func TestImages(t *testing.T) {

View File

@ -23,7 +23,7 @@ import (
"github.com/docker/docker/api/types/container" "github.com/docker/docker/api/types/container"
"golang.org/x/sync/errgroup" "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 { func (s *composeService) Kill(ctx context.Context, projectName string, options api.KillOptions) error {

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More