Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package docker-compose for openSUSE:Factory checked in at 2024-01-22 20:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/docker-compose (Old) and /work/SRC/openSUSE:Factory/.docker-compose.new.16006 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose" Mon Jan 22 20:34:21 2024 rev:32 rq:1140362 version:2.24.1 Changes: -------- --- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes 2024-01-16 21:37:07.654598945 +0100 +++ /work/SRC/openSUSE:Factory/.docker-compose.new.16006/docker-compose.changes 2024-01-22 20:34:47.366456242 +0100 @@ -1,0 +2,19 @@ +Thu Jan 18 14:05:57 UTC 2024 - [email protected] + +- Update to version 2.24.1: + * bump version of compose-go to v2.0.0-rc.1 + * build(deps): bump github.com/docker/docker + * remove watch command from the alpha command + * build(deps): bump github.com/docker/cli + * fix(tracing): batch span exports to prevent blocking + * signals/utils: always handle received signals + * fix engine version require to use healthcheck.start_interval + * Stop the resource timer after last expected event + * build(deps): bump github.com/containerd/containerd from 1.7.11 + to 1.7.12 (#11347) + * build(deps): bump github.com/docker/docker from + 25.0.0-rc.1+incompatible to 25.0.0-rc.2+incompatible (#11349) + * build(deps): bump github.com/docker/cli from + 25.0.0-rc.1+incompatible to 25.0.0-rc.2+incompatible (#11348) + +------------------------------------------------------------------- Old: ---- compose-2.24.0.obscpio New: ---- compose-2.24.1.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ docker-compose.spec ++++++ --- /var/tmp/diff_new_pack.97Cep8/_old 2024-01-22 20:34:48.774507665 +0100 +++ /var/tmp/diff_new_pack.97Cep8/_new 2024-01-22 20:34:48.774507665 +0100 @@ -19,7 +19,7 @@ %define __arch_install_post export NO_BRP_STRIP_DEBUG=true Name: docker-compose -Version: 2.24.0 +Version: 2.24.1 Release: 0 Summary: Define and run multi-container applications with Docker License: Apache-2.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.97Cep8/_old 2024-01-22 20:34:48.882511610 +0100 +++ /var/tmp/diff_new_pack.97Cep8/_new 2024-01-22 20:34:48.918512925 +0100 @@ -3,7 +3,7 @@ <param name="url">https://github.com/docker/compose</param> <param name="scm">git</param> <param name="exclude">.git</param> - <param name="revision">v2.24.0</param> + <param name="revision">v2.24.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="changesgenerate">enable</param> <param name="versionrewrite-pattern">v(.*)</param> @@ -17,7 +17,7 @@ <param name="compression">gz</param> </service> <service name="go_modules" mode="manual"> - <param name="archive">compose-2.24.0.obscpio</param> + <param name="archive">compose-2.24.1.obscpio</param> </service> </services> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.97Cep8/_old 2024-01-22 20:34:49.066518331 +0100 +++ /var/tmp/diff_new_pack.97Cep8/_new 2024-01-22 20:34:49.106519792 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/docker/compose</param> - <param name="changesrevision">8b16ab1040a3703fa7ae33328352980d4bdf196c</param></service></servicedata> + <param name="changesrevision">83e020734d65afac40525e2fa42f02f81cf70e99</param></service></servicedata> (No newline at EOF) ++++++ compose-2.24.0.obscpio -> compose-2.24.1.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/cmd/compose/alpha.go new/compose-2.24.1/cmd/compose/alpha.go --- old/compose-2.24.0/cmd/compose/alpha.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/cmd/compose/alpha.go 2024-01-18 10:47:24.000000000 +0100 @@ -31,7 +31,6 @@ }, } cmd.AddCommand( - watchCommand(p, dockerCli, backend), vizCommand(p, dockerCli, backend), publishCommand(p, dockerCli, backend), ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/cmd/compose/compose.go new/compose-2.24.1/cmd/compose/compose.go --- old/compose-2.24.0/cmd/compose/compose.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/cmd/compose/compose.go 2024-01-18 10:47:24.000000000 +0100 @@ -42,7 +42,6 @@ "github.com/spf13/cobra" "github.com/spf13/pflag" - "github.com/docker/cli/cli-plugins/plugin" "github.com/docker/compose/v2/cmd/formatter" "github.com/docker/compose/v2/pkg/api" "github.com/docker/compose/v2/pkg/compose" @@ -74,20 +73,17 @@ // AdaptCmd adapt a CobraCommand func to cobra library func AdaptCmd(fn CobraCommand) func(cmd *cobra.Command, args []string) error { return func(cmd *cobra.Command, args []string) error { - ctx := cmd.Context() - contextString := fmt.Sprintf("%s", ctx) - if !strings.Contains(contextString, ".WithCancel") || plugin.RunningStandalone() { // need to handle cancel - cancellableCtx, cancel := context.WithCancel(cmd.Context()) - ctx = cancellableCtx - s := make(chan os.Signal, 1) - signal.Notify(s, syscall.SIGTERM, syscall.SIGINT) - go func() { - <-s - cancel() - signal.Stop(s) - close(s) - }() - } + ctx, cancel := context.WithCancel(cmd.Context()) + + s := make(chan os.Signal, 1) + signal.Notify(s, syscall.SIGTERM, syscall.SIGINT) + go func() { + <-s + cancel() + signal.Stop(s) + close(s) + }() + err := fn(ctx, cmd, args) var composeErr compose.Error if api.IsErrCanceled(err) || errors.Is(ctx.Err(), context.Canceled) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/docs/reference/docker_compose_alpha.yaml new/compose-2.24.1/docs/reference/docker_compose_alpha.yaml --- old/compose-2.24.0/docs/reference/docker_compose_alpha.yaml 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/docs/reference/docker_compose_alpha.yaml 2024-01-18 10:47:24.000000000 +0100 @@ -6,11 +6,9 @@ cname: - docker compose alpha publish - docker compose alpha viz - - docker compose alpha watch clink: - docker_compose_alpha_publish.yaml - docker_compose_alpha_viz.yaml - - docker_compose_alpha_watch.yaml inherited_options: - option: dry-run value_type: bool diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/go.mod new/compose-2.24.1/go.mod --- old/compose-2.24.0/go.mod 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/go.mod 2024-01-18 10:47:24.000000000 +0100 @@ -6,15 +6,15 @@ github.com/AlecAivazis/survey/v2 v2.3.7 github.com/Microsoft/go-winio v0.6.1 github.com/buger/goterm v1.0.4 - github.com/compose-spec/compose-go/v2 v2.0.0-beta.3 + github.com/compose-spec/compose-go/v2 v2.0.0-rc.1 github.com/containerd/console v1.0.3 - github.com/containerd/containerd v1.7.11 + github.com/containerd/containerd v1.7.12 github.com/davecgh/go-spew v1.1.1 github.com/distribution/reference v0.5.0 github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315 - github.com/docker/cli v25.0.0-rc.1+incompatible + github.com/docker/cli v25.0.0-rc.3+incompatible github.com/docker/cli-docs-tool v0.6.0 - github.com/docker/docker v25.0.0-rc.1+incompatible + github.com/docker/docker v25.0.0-rc.3+incompatible github.com/docker/go-connections v0.5.0 github.com/docker/go-units v0.5.0 github.com/fsnotify/fsevents v0.1.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/go.sum new/compose-2.24.1/go.sum --- old/compose-2.24.0/go.sum 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/go.sum 2024-01-18 10:47:24.000000000 +0100 @@ -86,14 +86,14 @@ github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb h1:EDmT6Q9Zs+SbUoc7Ik9EfrFqcylYqgPZ9ANSbTAntnE= github.com/codahale/rfc6979 v0.0.0-20141003034818-6a90f24967eb/go.mod h1:ZjrT6AXHbDs86ZSdt/osfBi5qfexBrKUdONk989Wnk4= -github.com/compose-spec/compose-go/v2 v2.0.0-beta.3 h1:9MsMdwLaHE0uplnF2baXtM3yExD8Yaw3HUGlwm8Z+fQ= -github.com/compose-spec/compose-go/v2 v2.0.0-beta.3/go.mod h1:IVsvFyGVhw4FASzUtlWNVaAOhYmakXAFY9IlZ7LAuD8= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.1 h1:0nnSpdYg29uaQOU/YJ1YSgYgwkQr/XNZ0QAFtEPTtIA= +github.com/compose-spec/compose-go/v2 v2.0.0-rc.1/go.mod h1:IVsvFyGVhw4FASzUtlWNVaAOhYmakXAFY9IlZ7LAuD8= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.11 h1:lfGKw3eU35sjV0aG2eYZTiwFEY1pCzxdzicHP3SZILw= -github.com/containerd/containerd v1.7.11/go.mod h1:5UluHxHTX2rdvYuZ5OJTC5m/KJNs0Zs9wVoJm9zf5ZE= +github.com/containerd/containerd v1.7.12 h1:+KQsnv4VnzyxWcfO9mlxxELaoztsDEjOuCMPAuPqgU0= +github.com/containerd/containerd v1.7.12/go.mod h1:/5OMpE1p0ylxtEUGY8kuCYkDRzJm9NO1TFMWjUpdevk= github.com/containerd/continuity v0.4.2 h1:v3y/4Yz5jwnvqPKJJ+7Wf93fyWoCB3F5EclWG023MDM= github.com/containerd/continuity v0.4.2/go.mod h1:F6PTNCKepoxEaXLQp3wDAjygEnImnZ/7o4JzpodfroQ= github.com/containerd/fifo v1.1.0 h1:4I2mbh5stb1u6ycIABlBw9zgtlK8viPI9QkQNRQEEmY= @@ -122,15 +122,15 @@ github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E= github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315 h1:UZxx9xBADdf/9UmSdEUi+pdJoPKpgcf9QUAY5gEIYmY= github.com/docker/buildx v0.12.0-rc2.0.20231219140829-617f538cb315/go.mod h1:X8ZHhuW6ncwtoJ36TlU+gyaROTcBkTE01VHYmTStQCE= -github.com/docker/cli v25.0.0-rc.1+incompatible h1:TRaJCO3nQ0XvMWa8gUeIKRO8Dq61QQClpMWV0PmSDHA= -github.com/docker/cli v25.0.0-rc.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= +github.com/docker/cli v25.0.0-rc.3+incompatible h1:pk9OUWCVWtxZC5n9n4heCBSJq2IT6nixGUFDznbMtwo= +github.com/docker/cli v25.0.0-rc.3+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8= github.com/docker/cli-docs-tool v0.6.0 h1:Z9x10SaZgFaB6jHgz3OWooynhSa40CsWkpe5hEnG/qA= github.com/docker/cli-docs-tool v0.6.0/go.mod h1:zMjqTFCU361PRh8apiXzeAZ1Q/xupbIwTusYpzCXS/o= github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk= github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v25.0.0-rc.1+incompatible h1:Bdb06U1Z1P78uxluMZE6MI94tGICXzWnArsiW5hg6pU= -github.com/docker/docker v25.0.0-rc.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v25.0.0-rc.3+incompatible h1:f2YaukI/rOEueLwmDGAVcES5E8Y+BT/e7pQWLu/WZSk= +github.com/docker/docker v25.0.0-rc.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/docker-credential-helpers v0.8.0 h1:YQFtbBQb4VrpoPxhFuzEBPQ9E16qz5SpHLS+uswaCp8= github.com/docker/docker-credential-helpers v0.8.0/go.mod h1:UGFXcuoQ5TxPiB54nHOZ32AWRqQdECoh/Mg0AlEYb40= github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0= @@ -382,8 +382,6 @@ github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.1.0-rc5 h1:Ygwkfw9bpDvs+c9E34SdgGOj41dX/cbdlwvlWt0pnFI= github.com/opencontainers/image-spec v1.1.0-rc5/go.mod h1:X4pATf0uXsnn3g5aiGIsVnJBR4mxhKzfwmvK/B2NTm8= -github.com/opencontainers/runc v1.1.10 h1:EaL5WeO9lv9wmS6SASjszOeQdSctvpbu0DdBQBizE40= -github.com/opencontainers/runc v1.1.10/go.mod h1:+/R6+KmDlh+hOO8NkjmgkG9Qzvypzk0yXxAPYYR65+M= github.com/opencontainers/runtime-spec v1.1.0 h1:HHUyrt9mwHUjtasSbXSMvs4cyFxh+Bll4AjJ9odEGpg= github.com/opencontainers/runtime-spec v1.1.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/selinux v1.11.0 h1:+5Zbo97w3Lbmb3PeqQtpmTkMwsW5nRI3YaLpt7tQ7oU= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/internal/tracing/tracing.go new/compose-2.24.1/internal/tracing/tracing.go --- old/compose-2.24.0/internal/tracing/tracing.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/internal/tracing/tracing.go 2024-01-18 10:47:24.000000000 +0100 @@ -115,11 +115,9 @@ } muxExporter := MuxExporter{exporters: exporters} - sp := sdktrace.NewSimpleSpanProcessor(muxExporter) tracerProvider := sdktrace.NewTracerProvider( - sdktrace.WithSampler(sdktrace.AlwaysSample()), sdktrace.WithResource(res), - sdktrace.WithSpanProcessor(sp), + sdktrace.WithBatcher(muxExporter), ) otel.SetTracerProvider(tracerProvider) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/compose/convergence.go new/compose-2.24.1/pkg/compose/convergence.go --- old/compose-2.24.0/pkg/compose/convergence.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/compose/convergence.go 2024-01-18 10:47:24.000000000 +0100 @@ -737,7 +737,7 @@ return false, 0, nil } -func (s *composeService) startService(ctx context.Context, project *types.Project, service types.ServiceConfig, containers Containers) error { +func (s *composeService) startService(ctx context.Context, project *types.Project, service types.ServiceConfig, containers Containers, wait bool) error { if service.Deploy != nil && service.Deploy.Replicas != nil && *service.Deploy.Replicas == 0 { return nil } @@ -765,11 +765,28 @@ if err != nil { return err } - w.Event(progress.StartedEvent(eventName)) + status := progress.Done + if wait || dependencyWaiting(project, service.Name) { + status = progress.Working + } + w.Event(progress.NewEvent(eventName, status, "Started")) } return nil } +func dependencyWaiting(project *types.Project, name string) bool { + for _, service := range project.Services { + depends, ok := service.DependsOn[name] + if !ok { + continue + } + if depends.Condition == types.ServiceConditionHealthy { + return true + } + } + return false +} + func mergeLabels(ls ...types.Labels) types.Labels { merged := types.Labels{} for _, l := range ls { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/compose/convert.go new/compose-2.24.1/pkg/compose/convert.go --- old/compose-2.24.0/pkg/compose/convert.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/compose/convert.go 2024-01-18 10:47:24.000000000 +0100 @@ -74,7 +74,7 @@ return nil, err } if versions.LessThan(version, "1.44") { - return nil, errors.New("can't set healthcheck.start_interval as feature require Docker Engine 1.25 or later") + return nil, errors.New("can't set healthcheck.start_interval as feature require Docker Engine v25 or later") } else { startInterval = time.Duration(*check.StartInterval) } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/compose/start.go new/compose-2.24.1/pkg/compose/start.go --- old/compose-2.24.0/pkg/compose/start.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/compose/start.go 2024-01-18 10:47:24.000000000 +0100 @@ -129,7 +129,7 @@ return err } - return s.startService(ctx, project, service, containers) + return s.startService(ctx, project, service, containers, options.Wait) }) if err != nil { return err diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/compose/up.go new/compose-2.24.1/pkg/compose/up.go --- old/compose-2.24.0/pkg/compose/up.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/compose/up.go 2024-01-18 10:47:24.000000000 +0100 @@ -33,11 +33,14 @@ func (s *composeService) Up(ctx context.Context, project *types.Project, options api.UpOptions) error { //nolint:gocyclo err := progress.Run(ctx, tracing.SpanWrapFunc("project/up", tracing.ProjectOptions(project), func(ctx context.Context) error { + w := progress.ContextWriter(ctx) + w.HasMore(options.Start.Attach == nil) err := s.create(ctx, project, options.Create) if err != nil { return err } if options.Start.Attach == nil { + w.HasMore(false) return s.start(ctx, project.Name, options.Start, nil) } return nil diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/event.go new/compose-2.24.1/pkg/progress/event.go --- old/compose-2.24.0/pkg/progress/event.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/event.go 2024-01-18 10:47:24.000000000 +0100 @@ -191,6 +191,6 @@ case Error: return ErrorColor(spinnerError) default: - return e.spinner.String() + return CountColor(e.spinner.String()) } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/noop.go new/compose-2.24.1/pkg/progress/noop.go --- old/compose-2.24.0/pkg/progress/noop.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/noop.go 2024-01-18 10:47:24.000000000 +0100 @@ -38,3 +38,6 @@ func (p *noopWriter) Stop() { } + +func (p *noopWriter) HasMore(bool) { +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/plain.go new/compose-2.24.1/pkg/progress/plain.go --- old/compose-2.24.0/pkg/progress/plain.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/plain.go 2024-01-18 10:47:24.000000000 +0100 @@ -64,3 +64,6 @@ func (p *plainWriter) Stop() { p.done <- true } + +func (p *plainWriter) HasMore(bool) { +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/quiet.go new/compose-2.24.1/pkg/progress/quiet.go --- old/compose-2.24.0/pkg/progress/quiet.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/quiet.go 2024-01-18 10:47:24.000000000 +0100 @@ -35,3 +35,6 @@ func (q quiet) TailMsgf(_ string, _ ...interface{}) { } + +func (q quiet) HasMore(bool) { +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/tty.go new/compose-2.24.1/pkg/progress/tty.go --- old/compose-2.24.0/pkg/progress/tty.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/tty.go 2024-01-18 10:47:24.000000000 +0100 @@ -33,17 +33,18 @@ ) type ttyWriter struct { - out io.Writer - events map[string]Event - eventIDs []string - repeated bool - numLines int - done chan bool - mtx *sync.Mutex - tailEvents []string - dryRun bool - skipChildEvents bool - progressTitle string + out io.Writer + events map[string]Event + eventIDs []string + repeated bool + numLines int + done chan bool + mtx *sync.Mutex + tailEvents []string + dryRun bool + skipChildEvents bool + progressTitle string + hasFollowupAction bool } func (w *ttyWriter) Start(ctx context.Context) error { @@ -70,6 +71,10 @@ w.done <- true } +func (w *ttyWriter) HasMore(b bool) { + w.hasFollowupAction = b +} + func (w *ttyWriter) Event(e Event) { w.mtx.Lock() defer w.mtx.Unlock() @@ -82,6 +87,9 @@ } if _, ok := w.events[e.ID]; ok { last := w.events[e.ID] + if e.Status == Done && w.hasFollowupAction { + e.Status = Working + } switch e.Status { case Done, Error, Warning: if last.endTime.IsZero() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/tty_test.go new/compose-2.24.1/pkg/progress/tty_test.go --- old/compose-2.24.0/pkg/progress/tty_test.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/tty_test.go 2024-01-18 10:47:24.000000000 +0100 @@ -42,7 +42,7 @@ lineWidth := len(fmt.Sprintf("%s %s", ev.ID, ev.Text)) out := tty().lineText(ev, "", 50, lineWidth, false) - assert.Equal(t, out, " . id Text Status \x1b[34m0.0s \x1b[0m\n") + assert.Equal(t, out, " \x1b[33m.\x1b[0m id Text Status \x1b[34m0.0s \x1b[0m\n") ev.Status = Done out = tty().lineText(ev, "", 50, lineWidth, false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/compose-2.24.0/pkg/progress/writer.go new/compose-2.24.1/pkg/progress/writer.go --- old/compose-2.24.0/pkg/progress/writer.go 2024-01-11 14:11:12.000000000 +0100 +++ new/compose-2.24.1/pkg/progress/writer.go 2024-01-18 10:47:24.000000000 +0100 @@ -36,6 +36,7 @@ Event(Event) Events([]Event) TailMsgf(string, ...interface{}) + HasMore(more bool) } type writerKey struct{} ++++++ compose.obsinfo ++++++ --- /var/tmp/diff_new_pack.97Cep8/_old 2024-01-22 20:34:50.062554707 +0100 +++ /var/tmp/diff_new_pack.97Cep8/_new 2024-01-22 20:34:50.094555876 +0100 @@ -1,5 +1,5 @@ name: compose -version: 2.24.0 -mtime: 1704978672 -commit: 8b16ab1040a3703fa7ae33328352980d4bdf196c +version: 2.24.1 +mtime: 1705571244 +commit: 83e020734d65afac40525e2fa42f02f81cf70e99 ++++++ vendor.tar.gz ++++++ /work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz /work/SRC/openSUSE:Factory/.docker-compose.new.16006/vendor.tar.gz differ: char 5, line 1
