tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-11-15 11:19:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

next release will be major version v5.x

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

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

4
README.md
View File

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

4
cmd/cmdtrace/cmd_span.go
View File

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

2
cmd/cmdtrace/cmd_span_test.go
View File

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

2
cmd/compatibility/convert.go
View File

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

4
cmd/compose/attach.go
View File

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

6
cmd/compose/bridge.go
View File

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

6
cmd/compose/build.go
View File

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

4
cmd/compose/commit.go
View File

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

4
cmd/compose/completion.go
View File

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

14
cmd/compose/compose.go
View File

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

6
cmd/compose/config.go
View File

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

4
cmd/compose/cp.go
View File

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

4
cmd/compose/create.go
View File

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

6
cmd/compose/down.go
View File

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

4
cmd/compose/events.go
View File

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

4
cmd/compose/exec.go
View File

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

4
cmd/compose/export.go
View File

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

4
cmd/compose/generate.go
View File

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

6
cmd/compose/images.go
View File

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

6
cmd/compose/kill.go
View File

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

6
cmd/compose/list.go
View File

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

6
cmd/compose/logs.go
View File

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

6
cmd/compose/options.go
View File

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

2
cmd/compose/options_test.go
View File

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

4
cmd/compose/pause.go
View File

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

4
cmd/compose/port.go
View File

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

6
cmd/compose/ps.go
View File

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

4
cmd/compose/publish.go
View File

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

4
cmd/compose/pull.go
View File

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

4
cmd/compose/push.go
View File

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

4
cmd/compose/remove.go
View File

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

4
cmd/compose/restart.go
View File

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

8
cmd/compose/run.go
View File

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

4
cmd/compose/scale.go
View File

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

4
cmd/compose/start.go
View File

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

2
cmd/compose/stats.go
View File

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

4
cmd/compose/stop.go
View File

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

4
cmd/compose/top.go
View File

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

2
cmd/compose/top_test.go
View File

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

10
cmd/compose/up.go
View File

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

4
cmd/compose/version.go
View File

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

4
cmd/compose/version_test.go
View File

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

4
cmd/compose/viz.go
View File

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

4
cmd/compose/volumes.go
View File

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

4
cmd/compose/wait.go
View File

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

8
cmd/compose/watch.go
View File

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

2
cmd/display/json.go
View File

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

2
cmd/display/json_test.go
View File

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

2
cmd/display/plain.go
View File

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

2
cmd/display/quiet.go
View File

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

2
cmd/display/tty.go
View File

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

2
cmd/formatter/container.go
View File

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

2
cmd/formatter/formatter.go
View File

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

2
cmd/formatter/logs.go
View File

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

4
cmd/formatter/shortcut.go
View File

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

12
cmd/main.go
View File

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

4
cmd/prompt/prompt.go
View File

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

4
docs/sdk.md
View File

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

2
docs/yaml/main/generate.go
View File

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

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

4
internal/desktop/client.go
View File

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

2
internal/experimental/experimental.go
View File

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

2
internal/oci/push.go
View File

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

2
internal/oci/resolver.go
View File

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

2
internal/tracing/docker_context.go
View File

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

2
internal/tracing/tracing.go
View File

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

2
internal/tracing/tracing_test.go
View File

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

2
pkg/api/labels.go
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 (

2
pkg/api/labels_test.go
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"
)

4
pkg/bridge/convert.go
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"

4
pkg/compose/attach.go
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) {

2
pkg/compose/attach_service.go
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 {

6
pkg/compose/build.go
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"
)

2
pkg/compose/build_bake.go
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"

2
pkg/compose/build_classic.go
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"

2
pkg/compose/commit.go
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"
)

4
pkg/compose/compose.go
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

2
pkg/compose/containers.go
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"
)

6
pkg/compose/convergence.go
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 (

4
pkg/compose/convergence_test.go
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) {

2
pkg/compose/cp.go
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"
)

2
pkg/compose/create.go
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 {

2
pkg/compose/create_test.go
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"

2
pkg/compose/dependencies.go
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"
)

2
pkg/compose/dependencies_test.go
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"

4
pkg/compose/down.go
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"

4
pkg/compose/down_test.go
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) {

2
pkg/compose/events.go
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 {

2
pkg/compose/exec.go
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"
)

2
pkg/compose/export.go
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"
)

2
pkg/compose/filters.go
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"
)

2
pkg/compose/generate.go
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"

4
pkg/compose/hook.go
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"
)

2
pkg/compose/image_pruner.go
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

2
pkg/compose/images.go
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) {

2
pkg/compose/images_test.go
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) {

2
pkg/compose/kill.go
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 {

2
pkg/compose/kill_test.go
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"

4
pkg/compose/loader.go
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

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