Skip to content

chore(deps): update module github.com/docker/compose to v5 #1839

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pmig merged 2 commits into from
Feb 17, 2026
+96 −129
Merged

chore(deps): update module github.com/docker/compose to v5 #1839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
540114c
chore(deps): update module github.com/docker/compose to v5
kosmoz Feb 17, 2026
4ecd6e2
chore: create compose instance in init
kosmoz Feb 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions cmd/agent/docker/logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,29 +12,19 @@ import (

"github.com/distr-sh/distr/internal/deploymentlogs"
"github.com/distr-sh/distr/internal/types"
dockercommand "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/compose/convert"
composeapi "github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
composeapi "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/swarm"
"github.com/docker/docker/pkg/stdcopy"
"go.uber.org/zap"
)

type logsWatcher struct {
dockerCli dockercommand.Cli
composeService composeapi.Compose
logsExporter deploymentlogs.Exporter
}
type logsWatcher struct{ logsExporter deploymentlogs.Exporter }

func NewLogsWatcher() *logsWatcher {
return &logsWatcher{
dockerCli: dockerCli,
composeService: compose.NewComposeService(dockerCli),
logsExporter: deploymentlogs.ChunkExporter(client, 100),
}
return &logsWatcher{logsExporter: deploymentlogs.ChunkExporter(client, 100)}
}

func (lw *logsWatcher) Watch(ctx context.Context, d time.Duration) {
Expand Down Expand Up @@ -79,7 +69,7 @@ func (lw *logsWatcher) collect(ctx context.Context) {
logOptions.Since = since.Format(time.RFC3339Nano)
}

toplevelErr = lw.composeService.Logs(ctx, d.ProjectName, &composeCollector{deploymentCollector}, logOptions)
toplevelErr = composeService.Logs(ctx, d.ProjectName, &composeCollector{deploymentCollector}, logOptions)
if toplevelErr != nil {
logger.Warn("could not get compose logs", zap.Error(toplevelErr))
}
Expand All @@ -88,7 +78,7 @@ func (lw *logsWatcher) collect(ctx context.Context) {
// Getting the list of swarm services for the stack and then getting the logs for each service.
// Because we are interacting with the API directly, we also have to decode the raw stream into its
// stdout and stderr components.
apiClient := lw.dockerCli.Client()
apiClient := dockerCli.Client()
services, err := apiClient.ServiceList(
ctx,
swarm.ServiceListOptions{
Expand Down
8 changes: 6 additions & 2 deletions cmd/agent/docker/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import (
"github.com/distr-sh/distr/internal/util"
dockercommand "github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/flags"
composeapi "github.com/docker/compose/v5/pkg/api"
"github.com/docker/compose/v5/pkg/compose"
"github.com/google/uuid"
"go.uber.org/zap"
"go.uber.org/zap/zapcore"
Expand All @@ -38,8 +40,9 @@ var (
return zapcore.NewTee(c, platformLoggingCore)
}),
))
client = util.Require(agentclient.NewFromEnv(logger))
dockerCli = util.Require(dockercommand.NewDockerCli())
client = util.Require(agentclient.NewFromEnv(logger))
dockerCli = util.Require(dockercommand.NewDockerCli())
composeService composeapi.Compose
)

func init() {
Expand All @@ -48,6 +51,7 @@ func init() {
logger.Warn("AgentVersionID is not set. self updates will be disabled")
}
util.Must(dockerCli.Initialize(flags.NewClientOptions()))
composeService = util.Require(compose.NewComposeService(dockerCli))
}

func main() {
Expand Down
6 changes: 2 additions & 4 deletions cmd/agent/docker/restart.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import (
"github.com/distr-sh/distr/internal/types"
"github.com/docker/cli/cli/command"
"github.com/docker/cli/cli/compose/convert"
composeapi "github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
composeapi "github.com/docker/compose/v5/pkg/api"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/swarm"
"go.uber.org/multierr"
Expand All @@ -27,8 +26,7 @@ func RunDockerRestart(ctx context.Context, deployment AgentDeployment) error {
}

func RunDockerComposeRestart(ctx context.Context, deployment AgentDeployment) error {
compose := compose.NewComposeService(dockerCli)
err := compose.Restart(ctx, deployment.ProjectName, composeapi.RestartOptions{})
err := composeService.Restart(ctx, deployment.ProjectName, composeapi.RestartOptions{})
if err != nil {
return fmt.Errorf("failed to restart deployment %v: %w", deployment.ProjectName, err)
}
Expand Down
6 changes: 2 additions & 4 deletions cmd/agent/docker/status_check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ import (

"github.com/distr-sh/distr/internal/types"
"github.com/docker/cli/cli/compose/convert"
"github.com/docker/compose/v2/pkg/api"
"github.com/docker/compose/v2/pkg/compose"
"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/swarm"
Expand All @@ -29,8 +28,7 @@ func CheckDockerComposeStatus(
ctx context.Context,
deployment AgentDeployment,
) (types.DeploymentStatusType, string, error) {
compose := compose.NewComposeService(dockerCli)
summaries, err := compose.Ps(ctx, deployment.ProjectName, api.PsOptions{All: true})
summaries, err := composeService.Ps(ctx, deployment.ProjectName, api.PsOptions{All: true})
if err != nil {
return types.DeploymentStatusTypeError, "", err
}
Expand Down
52 changes: 22 additions & 30 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ require (
github.com/aws/aws-sdk-go-v2/credentials v1.19.7
github.com/aws/aws-sdk-go-v2/service/s3 v1.96.0
github.com/aws/aws-sdk-go-v2/service/ses v1.34.18
github.com/compose-spec/compose-go/v2 v2.9.1
github.com/compose-spec/compose-go/v2 v2.10.1
github.com/containerd/log v0.1.0
github.com/coreos/go-oidc/v3 v3.17.0
github.com/docker/cli v28.5.2+incompatible
github.com/docker/compose/v2 v2.40.3
github.com/docker/compose/v5 v5.0.2
github.com/docker/docker v28.5.2+incompatible
github.com/exaring/otelpgx v0.10.0
github.com/fsnotify/fsnotify v1.9.0
Expand Down Expand Up @@ -89,15 +89,13 @@ require (
github.com/ianlancetaylor/demangle v0.0.0-20240805132620-81f5be970eca // indirect
github.com/invopop/jsonschema v0.13.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/gopsutilenv v0.145.0 // indirect
github.com/opencontainers/selinux v1.13.1 // indirect
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
github.com/prometheus/client_golang v1.23.2 // indirect
github.com/prometheus/client_model v0.6.2 // indirect
github.com/prometheus/common v0.66.1 // indirect
github.com/samber/lo v1.52.0 // indirect
github.com/samber/slog-common v0.20.0 // indirect
github.com/santhosh-tekuri/jsonschema/v6 v6.0.2 // indirect
github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b // indirect
github.com/shibumi/go-pathspec v1.3.0 // indirect
github.com/shirou/gopsutil/v4 v4.26.1 // indirect
github.com/spf13/pflag v1.0.10 // indirect
Expand All @@ -120,7 +118,6 @@ require (
github.com/wk8/go-ordered-map/v2 v2.1.8 // indirect
github.com/yosida95/uritemplate/v3 v3.0.2 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
github.com/zclconf/go-cty v1.17.0 // indirect
go.opentelemetry.io/collector/confmap/xconfmap v0.145.0 // indirect
go.opentelemetry.io/collector/consumer/consumererror v0.145.0 // indirect
go.opentelemetry.io/collector/featuregate v1.51.0 // indirect
Expand All @@ -132,15 +129,16 @@ require (
go.opentelemetry.io/collector/receiver/receiverhelper v0.145.0 // indirect
go.opentelemetry.io/collector/scraper v0.145.0 // indirect
go.opentelemetry.io/collector/scraper/scraperhelper v0.145.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.61.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.61.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.36.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.36.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.36.0 // indirect
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.63.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.63.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 // indirect
go.opentelemetry.io/otel/log v0.14.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.40.0 // indirect
go.yaml.in/yaml/v2 v2.4.3 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
go.yaml.in/yaml/v4 v4.0.0-rc.3 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
k8s.io/component-helpers v0.35.1 // indirect
Expand All @@ -159,7 +157,6 @@ require (
github.com/Masterminds/squirrel v1.5.4 // indirect
github.com/Microsoft/go-winio v0.6.2 // indirect
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.4 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.17 // indirect
Expand All @@ -185,12 +182,12 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/chai2010/gettext-go v1.0.3 // indirect
github.com/containerd/console v1.0.5 // indirect
github.com/containerd/containerd/api v1.9.0 // indirect
github.com/containerd/containerd/v2 v2.1.5 // indirect
github.com/containerd/containerd/api v1.10.0 // indirect
github.com/containerd/containerd/v2 v2.2.1 // indirect
github.com/containerd/continuity v0.4.5 // indirect
github.com/containerd/errdefs v1.0.0 // indirect
github.com/containerd/errdefs/pkg v0.3.0 // indirect
github.com/containerd/platforms v1.0.0-rc.1 // indirect
github.com/containerd/platforms v1.0.0-rc.2 // indirect
github.com/containerd/ttrpc v1.2.7 // indirect
github.com/containerd/typeurl/v2 v2.2.3 // indirect
github.com/containers/image/v5 v5.36.2
Expand All @@ -201,8 +198,8 @@ require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.4.0 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/buildx v0.29.1 // indirect
github.com/docker/cli-docs-tool v0.10.0 // indirect
github.com/docker/buildx v0.30.1 // indirect
github.com/docker/cli-docs-tool v0.11.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.9.3 // indirect
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect
Expand All @@ -212,7 +209,7 @@ require (
github.com/docker/go-units v0.5.0 // indirect
github.com/ebitengine/purego v0.9.1 // indirect
github.com/eiannone/keyboard v0.0.0-20220611211555-0d226195f203 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
github.com/fatih/camelcase v1.0.0 // indirect
github.com/fatih/color v1.18.0 // indirect
Expand All @@ -233,18 +230,16 @@ require (
github.com/goccy/go-json v0.10.5 // indirect
github.com/gofrs/flock v0.13.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
github.com/golang-jwt/jwt/v5 v5.3.0 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/google/btree v1.1.3 // indirect
github.com/google/gnostic-models v0.7.0 // indirect
github.com/google/go-cmp v0.7.0 // indirect
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
github.com/gosuri/uitable v0.0.4 // indirect
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.7 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-version v1.8.0 // indirect
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
Expand All @@ -259,7 +254,7 @@ require (
github.com/jonboulle/clockwork v0.5.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/klauspost/compress v1.18.0 // indirect
github.com/klauspost/compress v1.18.2 // indirect
github.com/klauspost/cpuid/v2 v2.2.10 // indirect
github.com/knadh/koanf/maps v0.1.2 // indirect
github.com/knadh/koanf/providers/confmap v1.0.0 // indirect
Expand All @@ -284,16 +279,14 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/buildkit v0.25.1 // indirect
github.com/moby/buildkit v0.26.3 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/go-archive v0.1.0 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/patternmatcher v0.6.0 // indirect
github.com/moby/spdystream v0.5.0 // indirect
github.com/moby/swarmkit/v2 v2.0.0-20250103191802-8c1959736554 // indirect
github.com/moby/sys/atomicwriter v0.1.0 // indirect
github.com/moby/sys/capability v0.4.0 // indirect
github.com/moby/sys/mountinfo v0.7.2 // indirect
github.com/moby/sys/sequential v0.6.0 // indirect
github.com/moby/sys/signal v0.7.1 // indirect
github.com/moby/sys/symlink v0.3.0 // indirect
Expand All @@ -303,9 +296,8 @@ require (
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
github.com/morikuni/aec v1.0.0 // indirect
github.com/morikuni/aec v1.1.0 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/internal/filter v0.145.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/experimentalmetricmetadata v0.145.0 // indirect
github.com/open-telemetry/opentelemetry-collector-contrib/pkg/winperfcounters v0.145.0 // indirect
Expand All @@ -321,10 +313,10 @@ require (
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/rubenv/sql-migrate v1.8.1 // indirect
github.com/russross/blackfriday/v2 v2.1.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.0 // indirect
github.com/secure-systems-lab/go-securesystemslib v0.9.1 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
github.com/sirupsen/logrus v1.9.4 // indirect
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 // indirect
github.com/spf13/cast v1.8.0 // indirect
github.com/x448/float16 v0.8.4 // indirect
Expand All @@ -342,7 +334,7 @@ require (
golang.org/x/sys v0.41.0 // indirect
golang.org/x/term v0.40.0 // indirect
golang.org/x/text v0.34.0 // indirect
golang.org/x/time v0.12.0 // indirect
golang.org/x/time v0.14.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20260128011058-8636f8732409 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20260128011058-8636f8732409 // indirect
google.golang.org/grpc v1.78.0 // indirect
Expand All @@ -360,5 +352,5 @@ require (
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/yaml v1.6.0 // indirect
tags.cncf.io/container-device-interface v1.0.1 // indirect
tags.cncf.io/container-device-interface v1.1.0 // indirect
)
Loading
Loading