Revert "docker-compose: WIP [needs go 1.22.10+]: not for merge: update to v2.32.2"

This reverts commit 61c4511b2ac313c587a42012bd0e188b9b196758.
This commit is contained in:
Bruce Ashfield 2025-01-17 17:57:09 +00:00
parent a8d5387479
commit 054b06692c
4 changed files with 470 additions and 320 deletions

View File

@ -9,7 +9,7 @@ DEPENDS = " \
# Specify the first two important SRCREVs as the format
SRCREV_FORMAT="compose_survey"
SRCREV_compose = "fa395034692b71d066da3593058c819186782f88"
SRCREV_compose = "f79c28168bf6a95ea0cbd1c298f4a0ff4c3ac36b"
SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}"
@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=175792518e4ac015ab6696d16c4f60
GO_IMPORT = "import"
PV = "v2.32.2"
PV = "v2.28.1"
COMPOSE_PKG = "github.com/docker/compose/v2"

View File

@ -6,23 +6,21 @@
## explicit
# github.com/buger/goterm v1.0.4
## explicit
# github.com/compose-spec/compose-go/v2 v2.4.7
# github.com/compose-spec/compose-go/v2 v2.1.3
## explicit
# github.com/containerd/containerd v1.7.24
## explicit
# github.com/containerd/platforms v0.2.1
# github.com/containerd/containerd v1.7.18
## explicit
# github.com/davecgh/go-spew v1.1.1
## explicit
# github.com/distribution/reference v0.6.0
## explicit
# github.com/docker/buildx v0.19.2
# github.com/docker/buildx v0.15.1
## explicit
# github.com/docker/cli v27.4.0+incompatible
# github.com/docker/cli v27.0.1-rc.1+incompatible
## explicit
# github.com/docker/cli-docs-tool v0.8.0
# github.com/docker/cli-docs-tool v0.7.0
## explicit
# github.com/docker/docker v27.4.0+incompatible
# github.com/docker/docker v27.0.1-rc.1+incompatible
## explicit
# github.com/docker/go-connections v0.5.0
## explicit
@ -46,7 +44,7 @@
## explicit
# github.com/mitchellh/mapstructure v1.5.0
## explicit
# github.com/moby/buildkit v0.18.1
# github.com/moby/buildkit v0.14.1
## explicit
# github.com/moby/patternmatcher v0.6.0
## explicit
@ -70,45 +68,43 @@
## explicit
# github.com/spf13/pflag v1.0.5
## explicit
# github.com/stretchr/testify v1.10.0
# github.com/stretchr/testify v1.9.0
## explicit
# github.com/theupdateframework/notary v0.7.0
## explicit
# github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375
## explicit
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0
# go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1
## explicit
# go.opentelemetry.io/otel v1.28.0
# go.opentelemetry.io/otel v1.21.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0
## explicit
# go.opentelemetry.io/otel/metric v1.28.0
# go.opentelemetry.io/otel/metric v1.21.0
## explicit
# go.opentelemetry.io/otel/sdk v1.28.0
# go.opentelemetry.io/otel/sdk v1.21.0
## explicit
# go.opentelemetry.io/otel/trace v1.28.0
# go.opentelemetry.io/otel/trace v1.21.0
## explicit
# go.uber.org/goleak v1.3.0
## explicit
# go.uber.org/mock v0.5.0
# go.uber.org/mock v0.4.0
## explicit
# golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
# golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3
## explicit
# golang.org/x/sync v0.10.0
# golang.org/x/sync v0.7.0
## explicit
# golang.org/x/sys v0.28.0
# golang.org/x/sys v0.21.0
## explicit
# google.golang.org/grpc v1.68.1
# google.golang.org/grpc v1.59.0
## explicit
# gopkg.in/yaml.v3 v3.0.1
## explicit
# gotest.tools/v3 v3.5.1
## explicit
# tags.cncf.io/container-device-interface v0.8.0
## explicit
# dario.cat/mergo v1.0.1
# dario.cat/mergo v1.0.0
## explicit
# github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
## explicit
@ -116,6 +112,8 @@
## explicit
# github.com/Masterminds/semver/v3 v3.2.1
## explicit
# github.com/Microsoft/hcsshim v0.11.5
## explicit
# github.com/aws/aws-sdk-go-v2 v1.24.1
## explicit
# github.com/aws/aws-sdk-go-v2/config v1.26.6
@ -144,29 +142,27 @@
## explicit
# github.com/beorn7/perks v1.0.1
## explicit
# github.com/cenkalti/backoff/v4 v4.3.0
# github.com/cenkalti/backoff/v4 v4.2.1
## explicit
# github.com/cespare/xxhash/v2 v2.3.0
# github.com/cespare/xxhash/v2 v2.2.0
## explicit
# github.com/containerd/console v1.0.4
## explicit
# github.com/containerd/containerd/api v1.7.19
# github.com/containerd/continuity v0.4.3
## explicit
# github.com/containerd/continuity v0.4.5
## explicit
# github.com/containerd/errdefs v0.3.0
# github.com/containerd/errdefs v0.1.0
## explicit
# github.com/containerd/log v0.1.0
## explicit
# github.com/containerd/platforms v0.2.1
## explicit
# github.com/containerd/ttrpc v1.2.5
## explicit
# github.com/containerd/typeurl/v2 v2.2.3
## explicit
# github.com/cpuguy83/go-md2man/v2 v2.0.5
# github.com/containerd/typeurl/v2 v2.1.1
## explicit
# github.com/docker/distribution v2.8.3+incompatible
## explicit
# github.com/docker/docker-credential-helpers v0.8.2
# github.com/docker/docker-credential-helpers v0.8.0
## explicit
# github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c
## explicit
@ -176,9 +172,9 @@
## explicit
# github.com/felixge/httpsnoop v1.0.4
## explicit
# github.com/fvbommel/sortorder v1.1.0
# github.com/fvbommel/sortorder v1.0.2
## explicit
# github.com/go-logr/logr v1.4.2
# github.com/go-logr/logr v1.3.0
## explicit
# github.com/go-logr/stdr v1.2.2
## explicit
@ -190,7 +186,9 @@
## explicit
# github.com/go-viper/mapstructure/v2 v2.0.0
## explicit
# github.com/gofrs/flock v0.12.1
# github.com/gofrs/flock v0.8.1
## explicit
# github.com/gogo/googleapis v1.4.1
## explicit
# github.com/gogo/protobuf v1.3.2
## explicit
@ -208,7 +206,7 @@
## explicit
# github.com/gorilla/websocket v1.5.0
## explicit
# github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0
# github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0
## explicit
# github.com/hashicorp/errwrap v1.1.0
## explicit
@ -226,7 +224,7 @@
## explicit
# github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51
## explicit
# github.com/klauspost/compress v1.17.11
# github.com/klauspost/compress v1.17.4
## explicit
# github.com/mailru/easyjson v0.7.7
## explicit
@ -236,31 +234,27 @@
## explicit
# github.com/mattn/go-runewidth v0.0.15
## explicit
# github.com/matttproud/golang_protobuf_extensions v1.0.4
## explicit
# github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b
## explicit
# github.com/miekg/pkcs11 v1.1.1
## explicit
# github.com/mitchellh/hashstructure/v2 v2.0.2
## explicit
# github.com/moby/docker-image-spec v1.3.1
## explicit
# github.com/moby/locker v1.0.1
## explicit
# github.com/moby/spdystream v0.2.0
## explicit
# github.com/moby/sys/capability v0.4.0
# github.com/moby/sys/mountinfo v0.7.1
## explicit
# github.com/moby/sys/mountinfo v0.7.2
# github.com/moby/sys/sequential v0.5.0
## explicit
# github.com/moby/sys/sequential v0.6.0
## explicit
# github.com/moby/sys/signal v0.7.1
# github.com/moby/sys/signal v0.7.0
## explicit
# github.com/moby/sys/symlink v0.2.0
## explicit
# github.com/moby/sys/user v0.3.0
## explicit
# github.com/moby/sys/userns v0.1.0
# github.com/moby/sys/user v0.1.0
## explicit
# github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
## explicit
@ -274,33 +268,25 @@
## explicit
# github.com/pkg/errors v0.9.1
## explicit
# github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10
## explicit
# github.com/pmezard/go-difflib v1.0.0
## explicit
# github.com/prometheus/client_golang v1.20.2
# github.com/prometheus/client_golang v1.17.0
## explicit
# github.com/prometheus/client_model v0.6.1
# github.com/prometheus/client_model v0.5.0
## explicit
# github.com/prometheus/common v0.55.0
# github.com/prometheus/common v0.44.0
## explicit
# github.com/prometheus/procfs v0.15.1
# github.com/prometheus/procfs v0.12.0
## explicit
# github.com/rivo/uniseg v0.2.0
## explicit
# github.com/russross/blackfriday/v2 v2.1.0
## explicit
# github.com/secure-systems-lab/go-securesystemslib v0.4.0
## explicit
# github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b
## explicit
# github.com/shibumi/go-pathspec v1.3.0
## explicit
# github.com/tonistiigi/dchapes-mode v0.0.0-20241001053921-ca0759fec205
## explicit
# github.com/tonistiigi/fsutil v0.0.0-20241121093142-31cf1f437184
## explicit
# github.com/tonistiigi/go-csvvalue v0.0.0-20240710180619-ddb21b71c0b4
# github.com/tonistiigi/fsutil v0.0.0-20240424095704-91a3fc46842c
## explicit
# github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
## explicit
@ -312,39 +298,43 @@
## explicit
# github.com/xeipuuv/gojsonschema v1.2.0
## explicit
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.46.1
## explicit
# go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.53.0
# go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.46.1
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlpmetric v0.42.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v0.42.0
## explicit
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v0.42.0
## explicit
# go.opentelemetry.io/otel/sdk/metric v1.28.0
# go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.21.0
## explicit
# go.opentelemetry.io/proto/otlp v1.3.1
# go.opentelemetry.io/otel/sdk/metric v1.21.0
## explicit
# golang.org/x/crypto v0.31.0
# go.opentelemetry.io/proto/otlp v1.0.0
## explicit
# golang.org/x/net v0.33.0
# golang.org/x/crypto v0.22.0
## explicit
# golang.org/x/oauth2 v0.23.0
# golang.org/x/net v0.24.0
## explicit
# golang.org/x/term v0.27.0
# golang.org/x/oauth2 v0.11.0
## explicit
# golang.org/x/text v0.21.0
# golang.org/x/term v0.19.0
## explicit
# golang.org/x/time v0.6.0
# golang.org/x/text v0.14.0
## explicit
# google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
# golang.org/x/time v0.3.0
## explicit
# google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1
# google.golang.org/appengine v1.6.8
## explicit
# google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1
# google.golang.org/genproto v0.0.0-20231016165738-49dd2c1f3d0b
## explicit
# google.golang.org/protobuf v1.35.1
# google.golang.org/genproto/googleapis/api v0.0.0-20231016165738-49dd2c1f3d0b
## explicit
# google.golang.org/genproto/googleapis/rpc v0.0.0-20231016165738-49dd2c1f3d0b
## explicit
# google.golang.org/protobuf v1.33.0
## explicit
# gopkg.in/cenkalti/backoff.v1 v1.1.0
## explicit
@ -370,3 +360,5 @@
## explicit
# sigs.k8s.io/yaml v1.3.0
## explicit
# tags.cncf.io/container-device-interface v0.7.2
## explicit

View File

@ -59,6 +59,7 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/mitchellh/go-ps:github.com/mitchellh/go-ps:force \
github.com/sirupsen/logrus:github.com/sirupsen/logrus:force \
github.com/go-openapi/swag:github.com/go-openapi/swag:force \
github.com/gogo/googleapis:github.com/gogo/googleapis:force \
github.com/golang/protobuf:github.com/golang/protobuf:force \
github.com/mailru/easyjson:github.com/mailru/easyjson:force \
github.com/mattn/go-isatty:github.com/mattn/go-isatty:force \
@ -74,10 +75,12 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/serialx/hashring:github.com/serialx/hashring:force \
github.com/tonistiigi/units:github.com/tonistiigi/units:force \
github.com/tonistiigi/vt100:github.com/tonistiigi/vt100:force \
google.golang.org/appengine:google.golang.org/appengine:force \
github.com/eiannone/keyboard:github.com/eiannone/keyboard:force \
github.com/fsnotify/fsevents:github.com/fsnotify/fsevents:force \
github.com/tilt-dev/fsnotify:github.com/tilt-dev/fsnotify:force \
github.com/Azure/go-ansiterm:github.com/Azure/go-ansiterm:force \
github.com/Microsoft/hcsshim:github.com/Microsoft/hcsshim:force \
github.com/aws/aws-sdk-go-v2:github.com/aws/aws-sdk-go-v2:force \
github.com/cespare/xxhash/v2:github.com/cespare/xxhash/v2:force \
github.com/docker/go-metrics:github.com/docker/go-metrics:force \
@ -101,7 +104,6 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/modern-go/reflect2:github.com/modern-go/reflect2:force \
github.com/pmezard/go-difflib:github.com/pmezard/go-difflib:force \
github.com/moby/sys/signal:github.com/moby/sys/signal/signal:force \
github.com/moby/sys/userns:github.com/moby/sys/userns/userns:force \
github.com/jonboulle/clockwork:github.com/jonboulle/clockwork:force \
github.com/mattn/go-shellwords:github.com/mattn/go-shellwords:force \
github.com/moby/patternmatcher:github.com/moby/patternmatcher:force \
@ -109,9 +111,9 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/cenkalti/backoff/v4:github.com/cenkalti/backoff/v4:force \
github.com/docker/distribution:github.com/docker/distribution:force \
github.com/shibumi/go-pathspec:github.com/shibumi/go-pathspec:force \
github.com/containerd/platforms:github.com/containerd/platforms:force \
github.com/docker/cli-docs-tool:github.com/docker/cli-docs-tool:force \
github.com/hashicorp/go-version:github.com/hashicorp/go-version:force \
github.com/containerd/platforms:github.com/containerd/platforms:force \
github.com/moby/sys/symlink:github.com/moby/sys/symlink/symlink:force \
github.com/modern-go/concurrent:github.com/modern-go/concurrent:force \
github.com/xeipuuv/gojsonschema:github.com/xeipuuv/gojsonschema:force \
@ -121,7 +123,6 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/Masterminds/semver/v3:github.com/Masterminds/semver/v3:force \
github.com/containerd/continuity:github.com/containerd/continuity:force \
github.com/containerd/typeurl/v2:github.com/containerd/typeurl/v2:force \
github.com/cpuguy83/go-md2man/v2:github.com/cpuguy83/go-md2man/v2:force \
github.com/google/gnostic-models:github.com/google/gnostic-models:force \
github.com/xeipuuv/gojsonpointer:github.com/xeipuuv/gojsonpointer:force \
go.opentelemetry.io/proto/otlp:go.opentelemetry.io/proto/otlp/otlp:force \
@ -135,20 +136,15 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/in-toto/in-toto-golang:github.com/in-toto/in-toto-golang:force \
github.com/kballard/go-shellquote:github.com/kballard/go-shellquote:force \
github.com/moby/docker-image-spec:github.com/moby/docker-image-spec:force \
github.com/planetscale/vtprotobuf:github.com/planetscale/vtprotobuf:force \
github.com/tonistiigi/go-csvvalue:github.com/tonistiigi/go-csvvalue:force \
github.com/hashicorp/go-multierror:github.com/hashicorp/go-multierror:force \
github.com/moby/sys/mountinfo:github.com/moby/sys/mountinfo/mountinfo:force \
github.com/prometheus/client_model:github.com/prometheus/client_model:force \
github.com/russross/blackfriday/v2:github.com/russross/blackfriday/v2:force \
github.com/tonistiigi/dchapes-mode:github.com/tonistiigi/dchapes-mode:force \
github.com/xeipuuv/gojsonreference:github.com/xeipuuv/gojsonreference:force \
go.opentelemetry.io/otel/metric:go.opentelemetry.io/otel/metric/metric:force \
github.com/opencontainers/go-digest:github.com/opencontainers/go-digest:force \
github.com/go-openapi/jsonreference:github.com/go-openapi/jsonreference:force \
github.com/go-viper/mapstructure/v2:github.com/go-viper/mapstructure/v2:force \
github.com/prometheus/client_golang:github.com/prometheus/client_golang:force \
github.com/moby/sys/capability:github.com/moby/sys/capability/capability:force \
github.com/moby/sys/sequential:github.com/moby/sys/sequential/sequential:force \
github.com/opencontainers/image-spec:github.com/opencontainers/image-spec:force \
github.com/theupdateframework/notary:github.com/theupdateframework/notary:force \
@ -156,8 +152,6 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/inconshreveable/mousetrap:github.com/inconshreveable/mousetrap:force \
sigs.k8s.io/structured-merge-diff/v4:sigs.k8s.io/structured-merge-diff/v4:force \
github.com/compose-spec/compose-go/v2:github.com/compose-spec/compose-go/v2:force \
github.com/mitchellh/hashstructure/v2:github.com/mitchellh/hashstructure/v2:force \
github.com/containerd/containerd/api:github.com/containerd/containerd/api/api:force \
github.com/aws/aws-sdk-go-v2/config:github.com/aws/aws-sdk-go-v2/config/config:force \
tags.cncf.io/container-device-interface:tags.cncf.io/container-device-interface:force \
go.opentelemetry.io/otel/sdk/metric:go.opentelemetry.io/otel/sdk/metric/sdk/metric:force \
@ -167,6 +161,7 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/aws/aws-sdk-go-v2/service/sso:github.com/aws/aws-sdk-go-v2/service/sso/service/sso:force \
github.com/aws/aws-sdk-go-v2/service/sts:github.com/aws/aws-sdk-go-v2/service/sts/service/sts:force \
github.com/aws/aws-sdk-go-v2/internal/ini:github.com/aws/aws-sdk-go-v2/internal/ini/internal/ini:force \
github.com/matttproud/golang_protobuf_extensions:github.com/matttproud/golang_protobuf_extensions:force \
google.golang.org/genproto/googleapis/api:google.golang.org/genproto/googleapis/api/googleapis/api:force \
google.golang.org/genproto/googleapis/rpc:google.golang.org/genproto/googleapis/rpc/googleapis/rpc:force \
github.com/secure-systems-lab/go-securesystemslib:github.com/secure-systems-lab/go-securesystemslib:force \
@ -175,6 +170,7 @@ export sites="k8s.io/api:k8s.io/api:force \
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2:github.com/aws/aws-sdk-go-v2/internal/endpoints/v2/internal/endpoints/v2:force \
go.opentelemetry.io/otel/exporters/otlp/otlptrace:go.opentelemetry.io/otel/exporters/otlp/otlptrace/exporters/otlp/otlptrace:force \
github.com/aws/aws-sdk-go-v2/internal/configsources:github.com/aws/aws-sdk-go-v2/internal/configsources/internal/configsources:force \
go.opentelemetry.io/otel/exporters/otlp/otlpmetric:go.opentelemetry.io/otel/exporters/otlp/otlpmetric/exporters/otlp/otlpmetric:force \
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url:github.com/aws/aws-sdk-go-v2/service/internal/presigned-url/service/internal/presigned-url:force \
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding:github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding/service/internal/accept-encoding:force \
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp:go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp/instrumentation/net/http/otelhttp:force \

File diff suppressed because it is too large Load Diff