WIP migrate to moby/api and moby/client

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Author: thaJeztah

Dockerfile.example

@@ -0,0 +1,2 @@
+FROM busybox
+RUN echo "foo" > /foo

cli-vendor.mod

@@ -0,0 +1,64 @@
+	dario.cat/mergo v1.0.0
+	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
+	github.com/beorn7/perks v1.0.1
+	github.com/cespare/xxhash/v2 v2.2.0
+	github.com/containerd/containerd v1.7.11
+	github.com/containerd/log v0.1.0
+	github.com/distribution/reference v0.5.0
+	github.com/docker/distribution v2.8.3+incompatible
+	github.com/docker/docker-credential-helpers v0.8.0
+	github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c
+	github.com/docker/go-connections v0.5.0
+	github.com/docker/go-metrics v0.0.1
+	github.com/docker/go-units v0.5.0
+	github.com/felixge/httpsnoop v1.0.4
+	github.com/fvbommel/sortorder v1.0.2
+	github.com/go-logr/logr v1.2.4
+	github.com/go-logr/stdr v1.2.2
+	github.com/gogo/protobuf v1.3.2
+	github.com/golang/protobuf v1.5.3
+	github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
+	github.com/gorilla/mux v1.8.1
+	github.com/inconshreveable/mousetrap v1.1.0
+	github.com/klauspost/compress v1.17.4
+	github.com/mattn/go-runewidth v0.0.15
+	github.com/matttproud/golang_protobuf_extensions v1.0.4
+	github.com/Microsoft/go-winio v0.6.1
+	github.com/Microsoft/hcsshim v0.11.4
+	github.com/miekg/pkcs11 v1.1.1
+	github.com/mitchellh/mapstructure v1.5.0
+	github.com/moby/patternmatcher v0.6.0
+	github.com/moby/sys/sequential v0.5.0
+	github.com/moby/sys/signal v0.7.0
+	github.com/moby/sys/symlink v0.2.0
+	github.com/moby/sys/user v0.1.0
+	github.com/moby/term v0.5.0
+	github.com/morikuni/aec v1.0.0
+	github.com/opencontainers/go-digest v1.0.0
+	github.com/opencontainers/image-spec v1.1.0-rc5
+	github.com/pkg/errors v0.9.1
+	github.com/prometheus/common v0.42.0
+	github.com/rivo/uniseg v0.2.0
+	github.com/sirupsen/logrus v1.9.3
+	github.com/spf13/cobra v1.8.0
+	github.com/spf13/pflag v1.0.5
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
+	github.com/xeipuuv/gojsonschema v1.2.0
+	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0
+	go.opentelemetry.io/otel v1.19.0
+	go.opentelemetry.io/otel/metric v1.19.0
+	go.opentelemetry.io/otel/trace v1.19.0
+	golang.org/x/crypto v0.17.0
+	golang.org/x/mod v0.11.0
+	golang.org/x/net v0.17.0
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.15.0
+	golang.org/x/term v0.15.0
+	golang.org/x/text v0.14.0
+	golang.org/x/time v0.3.0
+	golang.org/x/tools v0.10.0
+	google.golang.org/protobuf v1.31.0
+	gopkg.in/yaml.v2 v2.4.0
+	gotest.tools/v3 v3.5.1
+	tags.cncf.io/container-device-interface v0.6.2

cmd/compose/bridge.go

@@ -23,9 +23,9 @@ import (
 
 	"github.com/distribution/reference"
 	"github.com/docker/cli/cli/command"
-	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"
+	"github.com/moby/moby/api/types/image"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose/v2/cmd/formatter"

cmd/compose/stats.go

@@ -22,7 +22,7 @@ import (
 
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/command/container"
-	"github.com/docker/docker/api/types/filters"
+	"github.com/moby/moby/api/types/filters"
 	"github.com/spf13/cobra"
 
 	"github.com/docker/compose/v2/pkg/api"

cmd/formatter/container.go

@@ -24,9 +24,9 @@ import (
 
 	"github.com/docker/cli/cli/command/formatter"
 	"github.com/docker/compose/v2/pkg/api"
-	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/pkg/stringid"
 	"github.com/docker/go-units"
+	"github.com/moby/moby/api/types/container"
 )
 
 const (

cmd/main.go

@@ -24,7 +24,7 @@ import (
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/compose/v2/cmd/cmdtrace"
-	"github.com/docker/docker/client"
+	"github.com/moby/moby/client"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 

compose.mod

@@ -0,0 +1,186 @@
+dario.cat/mergo v1.0.1
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
+github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
+github.com/AlecAivazis/survey/v2 v2.3.7
+github.com/aws/aws-sdk-go-v2 v1.24.1
+github.com/aws/aws-sdk-go-v2/config v1.26.6
+github.com/aws/aws-sdk-go-v2/credentials v1.16.16
+github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.14.11
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.2.10
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.5.10
+github.com/aws/aws-sdk-go-v2/internal/ini v1.7.3
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.10.4
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.10.10
+github.com/aws/aws-sdk-go-v2/service/sso v1.18.7
+github.com/aws/aws-sdk-go-v2/service/ssooidc v1.21.7
+github.com/aws/aws-sdk-go-v2/service/sts v1.26.7
+github.com/aws/smithy-go v1.19.0
+github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
+github.com/beorn7/perks v1.0.1
+github.com/buger/goterm v1.0.4
+github.com/cenkalti/backoff/v4 v4.2.1
+github.com/cespare/xxhash/v2 v2.3.0
+github.com/compose-spec/compose-go/v2 v2.4.4
+github.com/containerd/console v1.0.4
+github.com/containerd/containerd v1.7.23
+github.com/containerd/containerd/api v1.7.19
+github.com/containerd/continuity v0.4.4
+github.com/containerd/errdefs v0.3.0
+github.com/containerd/log v0.1.0
+github.com/containerd/platforms v0.2.1
+github.com/containerd/ttrpc v1.2.5
+github.com/containerd/typeurl/v2 v2.2.0
+github.com/cpuguy83/go-md2man/v2 v2.0.5
+github.com/davecgh/go-spew v1.1.1
+github.com/distribution/reference v0.6.0
+github.com/docker/buildx v0.18.0
+github.com/docker/cli v27.3.2-0.20241008150905-cb3048fbebb1+incompatible
+github.com/docker/cli-docs-tool v0.8.0
+github.com/docker/distribution v2.8.3+incompatible
+github.com/docker/docker v27.4.0-rc.1+incompatible
+github.com/docker/docker-credential-helpers v0.8.2
+github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c
+github.com/docker/go-connections v0.5.0
+github.com/docker/go-metrics v0.0.1
+github.com/docker/go-units v0.5.0
+github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203
+github.com/emicklei/go-restful/v3 v3.11.0
+github.com/felixge/httpsnoop v1.0.4
+github.com/fsnotify/fsevents v0.2.0
+github.com/fvbommel/sortorder v1.1.0
+github.com/go-logr/logr v1.4.1
+github.com/go-logr/stdr v1.2.2
+github.com/go-openapi/jsonpointer v0.19.6
+github.com/go-openapi/jsonreference v0.20.2
+github.com/go-openapi/swag v0.22.3
+github.com/go-viper/mapstructure/v2 v2.0.0
+github.com/gofrs/flock v0.12.1
+github.com/gogo/protobuf v1.3.2
+github.com/golang/protobuf v1.5.4
+github.com/google/gnostic-models v0.6.8
+github.com/google/go-cmp v0.6.0
+github.com/google/gofuzz v1.2.0
+github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
+github.com/google/uuid v1.6.0
+github.com/gorilla/mux v1.8.1
+github.com/gorilla/websocket v1.5.0
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
+github.com/hashicorp/errwrap v1.1.0
+github.com/hashicorp/go-cleanhttp v0.5.2
+github.com/hashicorp/go-multierror v1.1.1
+github.com/hashicorp/go-version v1.7.0
+github.com/imdario/mergo v0.3.16
+github.com/in-toto/in-toto-golang v0.5.0
+github.com/inconshreveable/mousetrap v1.1.0
+github.com/jonboulle/clockwork v0.4.0
+github.com/josharian/intern v1.0.0
+github.com/json-iterator/go v1.1.12
+github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
+github.com/klauspost/compress v1.17.11
+github.com/mailru/easyjson v0.7.7
+github.com/Masterminds/semver/v3 v3.2.1
+github.com/mattn/go-colorable v0.1.13
+github.com/mattn/go-isatty v0.0.17
+github.com/mattn/go-runewidth v0.0.15
+github.com/mattn/go-shellwords v1.0.12
+github.com/matttproud/golang_protobuf_extensions v1.0.4
+github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
+github.com/Microsoft/go-winio v0.6.2
+github.com/miekg/pkcs11 v1.1.1
+github.com/mitchellh/go-ps v1.0.0
+github.com/mitchellh/hashstructure/v2 v2.0.2
+github.com/mitchellh/mapstructure v1.5.0
+github.com/moby/buildkit v0.17.1
+github.com/moby/docker-image-spec v1.3.1
+github.com/moby/locker v1.0.1
+github.com/moby/patternmatcher v0.6.0
+github.com/moby/spdystream v0.2.0
+github.com/moby/sys/mountinfo v0.7.2
+github.com/moby/sys/sequential v0.6.0
+github.com/moby/sys/signal v0.7.1
+github.com/moby/sys/symlink v0.3.0
+github.com/moby/sys/user v0.3.0
+github.com/moby/sys/userns v0.1.0
+github.com/moby/term v0.5.0
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
+github.com/modern-go/reflect2 v1.0.2
+github.com/morikuni/aec v1.0.0
+github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
+github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
+github.com/opencontainers/go-digest v1.0.0
+github.com/opencontainers/image-spec v1.1.0
+github.com/otiai10/copy v1.14.0
+github.com/pelletier/go-toml v1.9.5
+github.com/pkg/errors v0.9.1
+github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
+github.com/pmezard/go-difflib v1.0.0
+github.com/prometheus/client_golang v1.17.0
+github.com/prometheus/client_model v0.5.0
+github.com/prometheus/common v0.44.0
+github.com/prometheus/procfs v0.15.1
+github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc
+github.com/rivo/uniseg v0.2.0
+github.com/russross/blackfriday/v2 v2.1.0
+github.com/secure-systems-lab/go-securesystemslib v0.4.0
+github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
+github.com/shibumi/go-pathspec v1.3.0
+github.com/sirupsen/logrus v1.9.3
+github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966
+github.com/spf13/cobra v1.8.1
+github.com/spf13/pflag v1.0.5
+github.com/stretchr/testify v1.9.0
+github.com/theupdateframework/notary v0.7.0
+github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375
+github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205
+github.com/tonistiigi/fsutil v0.0.0-20241028165955-397af5306b5c
+github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
+github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
+github.com/tonistiigi/vt100 v0.0.0-20240514184818-90bafcd6abab
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415
+github.com/xeipuuv/gojsonschema v1.2.0
+go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
+go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1
+go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
+go.opentelemetry.io/otel v1.21.0
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.44.0
+go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.44.0
+go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
+go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0
+go.opentelemetry.io/otel/metric v1.21.0
+go.opentelemetry.io/otel/sdk v1.21.0
+go.opentelemetry.io/otel/sdk/metric v1.21.0
+go.opentelemetry.io/otel/trace v1.21.0
+go.opentelemetry.io/proto/otlp v1.0.0
+go.uber.org/goleak v1.3.0
+go.uber.org/mock v0.5.0
+golang.org/x/crypto v0.27.0
+golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
+golang.org/x/net v0.29.0
+golang.org/x/oauth2 v0.22.0
+golang.org/x/sync v0.9.0
+golang.org/x/sys v0.27.0
+golang.org/x/term v0.24.0
+golang.org/x/text v0.18.0
+golang.org/x/time v0.6.0
+google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
+google.golang.org/genproto/googleapis/api v0.0.0-20240814211410-ddb44dafa142
+google.golang.org/genproto/googleapis/rpc v0.0.0-20240814211410-ddb44dafa142
+google.golang.org/grpc v1.67.1
+google.golang.org/protobuf v1.35.1
+gopkg.in/cenkalti/backoff.v1 v1.1.0
+gopkg.in/inf.v0 v0.9.1
+gopkg.in/yaml.v2 v2.4.0
+gopkg.in/yaml.v3 v3.0.1
+gotest.tools/v3 v3.5.1
+k8s.io/api v0.29.2
+k8s.io/apimachinery v0.29.2
+k8s.io/client-go v0.29.2
+k8s.io/klog/v2 v2.110.1
+k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
+k8s.io/utils v0.0.0-20230726121419-3b25d923346b
+sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd
+sigs.k8s.io/structured-merge-diff/v4 v4.4.1
+sigs.k8s.io/yaml v1.3.0
+tags.cncf.io/container-device-interface v0.8.0

docker-compose.xml

@@ -0,0 +1,6 @@
+<services>
+  <web>
+    <image>nginx:alpine</image>
+    <ports>8080:80</ports>
+  </web>
+</services>

docker-compose.yaml

@@ -0,0 +1,6 @@
+services:
+  web:
+    image: nginx:alpine
+    ports:
+      - 8080:80
+      - 10443:443