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

@@ -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 (

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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

View File

@@ -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"
)

View File

@@ -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 (

View File

@@ -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) {

View File

@@ -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"
)

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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

View File

@@ -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"
)

View File

@@ -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(

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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

View File

@@ -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

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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 {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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) {

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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 (

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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"
)

View File

@@ -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) {

View File

@@ -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"
)

View File

@@ -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"
)