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-06-25 23:07:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-compose (Old)
and /work/SRC/openSUSE:Factory/.docker-compose.new.18349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose"
Tue Jun 25 23:07:24 2024 rev:44 rq:1183059 version:2.28.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes
2024-06-24 20:52:49.159269428 +0200
+++ /work/SRC/openSUSE:Factory/.docker-compose.new.18349/docker-compose.changes
2024-06-25 23:08:10.683838028 +0200
@@ -1,0 +2,7 @@
+Mon Jun 24 18:55:23 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 2.28.1:
+ * Remove `console.Terminal` check and use `IsTerminal` from
+ `streams.Out`
+
+-------------------------------------------------------------------
Old:
----
compose-2.28.0.obscpio
New:
----
compose-2.28.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-compose.spec ++++++
--- /var/tmp/diff_new_pack.pel5IF/_old 2024-06-25 23:08:11.927883377 +0200
+++ /var/tmp/diff_new_pack.pel5IF/_new 2024-06-25 23:08:11.931883522 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: docker-compose
-Version: 2.28.0
+Version: 2.28.1
Release: 0
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.pel5IF/_old 2024-06-25 23:08:11.959884543 +0200
+++ /var/tmp/diff_new_pack.pel5IF/_new 2024-06-25 23:08:11.963884689 +0200
@@ -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.28.0</param>
+ <param name="revision">v2.28.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.28.0.obscpio</param>
+ <param name="archive">compose-2.28.1.obscpio</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.pel5IF/_old 2024-06-25 23:08:11.983885418 +0200
+++ /var/tmp/diff_new_pack.pel5IF/_new 2024-06-25 23:08:11.987885564 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/docker/compose</param>
- <param
name="changesrevision">6a000dcff1300e137bb52467d3934e9211a017ed</param></service></servicedata>
+ <param
name="changesrevision">f79c28168bf6a95ea0cbd1c298f4a0ff4c3ac36b</param></service></servicedata>
(No newline at EOF)
++++++ compose-2.28.0.obscpio -> compose-2.28.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.28.0/go.mod new/compose-2.28.1/go.mod
--- old/compose-2.28.0/go.mod 2024-06-21 14:04:40.000000000 +0200
+++ new/compose-2.28.1/go.mod 2024-06-24 14:58:19.000000000 +0200
@@ -8,7 +8,6 @@
github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d
github.com/buger/goterm v1.0.4
github.com/compose-spec/compose-go/v2 v2.1.3
- github.com/containerd/console v1.0.4
github.com/containerd/containerd v1.7.18
github.com/davecgh/go-spew v1.1.1
github.com/distribution/reference v0.6.0
@@ -81,6 +80,7 @@
github.com/beorn7/perks v1.0.1 // indirect
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
+ github.com/containerd/console v1.0.4 // indirect
github.com/containerd/continuity v0.4.3 // indirect
github.com/containerd/errdefs v0.1.0 // indirect
github.com/containerd/log v0.1.0 // indirect
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.28.0/pkg/compose/compose.go
new/compose-2.28.1/pkg/compose/compose.go
--- old/compose-2.28.0/pkg/compose/compose.go 2024-06-21 14:04:40.000000000
+0200
+++ new/compose-2.28.1/pkg/compose/compose.go 2024-06-24 14:58:19.000000000
+0200
@@ -20,7 +20,6 @@
"context"
"errors"
"fmt"
- "io"
"os"
"strconv"
"strings"
@@ -129,11 +128,11 @@
return s.dockerCli.In()
}
-func (s *composeService) stderr() io.Writer {
+func (s *composeService) stderr() *streams.Out {
return s.dockerCli.Err()
}
-func (s *composeService) stdinfo() io.Writer {
+func (s *composeService) stdinfo() *streams.Out {
if stdioToStdout {
return s.dockerCli.Out()
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.28.0/pkg/progress/writer.go
new/compose-2.28.1/pkg/progress/writer.go
--- old/compose-2.28.0/pkg/progress/writer.go 2024-06-21 14:04:40.000000000
+0200
+++ new/compose-2.28.1/pkg/progress/writer.go 2024-06-24 14:58:19.000000000
+0200
@@ -21,9 +21,7 @@
"io"
"sync"
- "github.com/containerd/console"
- "github.com/moby/term"
- "github.com/sirupsen/logrus"
+ "github.com/docker/cli/cli/streams"
"golang.org/x/sync/errgroup"
"github.com/docker/compose/v2/pkg/api"
@@ -59,14 +57,14 @@
type progressFuncWithStatus func(context.Context) (string, error)
// Run will run a writer and the progress function in parallel
-func Run(ctx context.Context, pf progressFunc, out io.Writer) error {
+func Run(ctx context.Context, pf progressFunc, out *streams.Out) error {
_, err := RunWithStatus(ctx, func(ctx context.Context) (string, error) {
return "", pf(ctx)
}, out, "Running")
return err
}
-func RunWithTitle(ctx context.Context, pf progressFunc, out io.Writer,
progressTitle string) error {
+func RunWithTitle(ctx context.Context, pf progressFunc, out *streams.Out,
progressTitle string) error {
_, err := RunWithStatus(ctx, func(ctx context.Context) (string, error) {
return "", pf(ctx)
}, out, progressTitle)
@@ -74,7 +72,7 @@
}
// RunWithStatus will run a writer and the progress function in parallel and
return a status
-func RunWithStatus(ctx context.Context, pf progressFuncWithStatus, out
io.Writer, progressTitle string) (string, error) {
+func RunWithStatus(ctx context.Context, pf progressFuncWithStatus, out
*streams.Out, progressTitle string) (string, error) {
eg, _ := errgroup.WithContext(ctx)
w, err := NewWriter(ctx, out, progressTitle)
var result string
@@ -115,8 +113,8 @@
var Mode = ModeAuto
// NewWriter returns a new multi-progress writer
-func NewWriter(ctx context.Context, out io.Writer, progressTitle string)
(Writer, error) {
- _, isTerminal := term.GetFdInfo(out)
+func NewWriter(ctx context.Context, out *streams.Out, progressTitle string)
(Writer, error) {
+ isTerminal := out.IsTerminal()
dryRun, ok := ctx.Value(api.DryRunKey{}).(bool)
if !ok {
dryRun = false
@@ -124,16 +122,13 @@
if Mode == ModeQuiet {
return quiet{}, nil
}
- f, isConsole := out.(console.File) // see
https://github.com/docker/compose/issues/10560
- if Mode == ModeAuto && isTerminal && isConsole {
- return newTTYWriter(f, dryRun, progressTitle)
- }
- if Mode == ModeTTY {
- if !isConsole {
- logrus.Warn("Terminal is not a POSIX console")
- } else {
- return newTTYWriter(f, dryRun, progressTitle)
- }
+
+ tty := Mode == ModeTTY
+ if Mode == ModeAuto && isTerminal {
+ tty = true
+ }
+ if tty {
+ return newTTYWriter(out, dryRun, progressTitle)
}
return &plainWriter{
out: out,
@@ -142,14 +137,9 @@
}, nil
}
-func newTTYWriter(out console.File, dryRun bool, progressTitle string)
(Writer, error) {
- con, err := console.ConsoleFromFile(out)
- if err != nil {
- return nil, err
- }
-
+func newTTYWriter(out io.Writer, dryRun bool, progressTitle string) (Writer,
error) {
return &ttyWriter{
- out: con,
+ out: out,
eventIDs: []string{},
events: map[string]Event{},
repeated: false,
++++++ compose.obsinfo ++++++
--- /var/tmp/diff_new_pack.pel5IF/_old 2024-06-25 23:08:12.207893584 +0200
+++ /var/tmp/diff_new_pack.pel5IF/_new 2024-06-25 23:08:12.211893729 +0200
@@ -1,5 +1,5 @@
name: compose
-version: 2.28.0
-mtime: 1718971480
-commit: 6a000dcff1300e137bb52467d3934e9211a017ed
+version: 2.28.1
+mtime: 1719233899
+commit: f79c28168bf6a95ea0cbd1c298f4a0ff4c3ac36b
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz
/work/SRC/openSUSE:Factory/.docker-compose.new.18349/vendor.tar.gz differ: char
5, line 1
