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-04-02 16:41:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-compose (Old)
and /work/SRC/openSUSE:Factory/.docker-compose.new.1905 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose"
Tue Apr 2 16:41:24 2024 rev:40 rq:1163684 version:2.26.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes
2024-03-25 21:13:54.633767396 +0100
+++ /work/SRC/openSUSE:Factory/.docker-compose.new.1905/docker-compose.changes
2024-04-02 16:43:06.966661297 +0200
@@ -1,0 +2,11 @@
+Sat Mar 30 10:30:28 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 2.26.1:
+ * Does not start keyboard manager if there is no tty
+ * Change menu information text to dim
+ * Handle --no-build and --watch args
+ * build(deps): bump github.com/opencontainers/image-spec
+ * Unwrap error message.
+ * Include error message in pull warning/errors
+
+-------------------------------------------------------------------
Old:
----
compose-2.26.0.obscpio
New:
----
compose-2.26.1.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-compose.spec ++++++
--- /var/tmp/diff_new_pack.jGM7fY/_old 2024-04-02 16:43:07.914695137 +0200
+++ /var/tmp/diff_new_pack.jGM7fY/_new 2024-04-02 16:43:07.914695137 +0200
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: docker-compose
-Version: 2.26.0
+Version: 2.26.1
Release: 0
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.jGM7fY/_old 2024-04-02 16:43:07.942696137 +0200
+++ /var/tmp/diff_new_pack.jGM7fY/_new 2024-04-02 16:43:07.946696279 +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.26.0</param>
+ <param name="revision">v2.26.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.26.0.obscpio</param>
+ <param name="archive">compose-2.26.1.obscpio</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.jGM7fY/_old 2024-04-02 16:43:07.962696850 +0200
+++ /var/tmp/diff_new_pack.jGM7fY/_new 2024-04-02 16:43:07.966696994 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/docker/compose</param>
- <param
name="changesrevision">3371227794f5f3645f4f19829c60a741635ed329</param></service></servicedata>
+ <param
name="changesrevision">ff20b641c7f1cce588faea476fbd1a6fdd953b36</param></service></servicedata>
(No newline at EOF)
++++++ compose-2.26.0.obscpio -> compose-2.26.1.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/cmd/compose/up.go
new/compose-2.26.1/cmd/compose/up.go
--- old/compose-2.26.0/cmd/compose/up.go 2024-03-22 18:16:27.000000000
+0100
+++ new/compose-2.26.1/cmd/compose/up.go 2024-03-28 18:57:26.000000000
+0100
@@ -79,6 +79,16 @@
return project, nil
}
+func (opts *upOptions) validateNavigationMenu(dockerCli command.Cli,
experimentals *experimental.State) {
+ if !dockerCli.Out().IsTerminal() {
+ opts.navigationMenu = false
+ return
+ }
+ if !opts.navigationMenuChanged {
+ opts.navigationMenu = SetUnchangedOption(ComposeMenu,
experimentals.NavBar())
+ }
+}
+
func upCommand(p *ProjectOptions, dockerCli command.Cli, backend api.Service,
experiments *experimental.State) *cobra.Command {
up := upOptions{}
create := createOptions{}
@@ -100,7 +110,10 @@
if len(up.attach) != 0 && up.attachDependencies {
return errors.New("cannot combine --attach and
--attach-dependencies")
}
- return runUp(ctx, dockerCli, backend, experiments,
create, up, build, project, services)
+
+ up.validateNavigationMenu(dockerCli, experiments)
+
+ return runUp(ctx, dockerCli, backend, create, up,
build, project, services)
}),
ValidArgsFunction: completeServiceNames(dockerCli, p),
}
@@ -137,6 +150,7 @@
return upCmd
}
+//nolint:gocyclo
func validateFlags(up *upOptions, create *createOptions) error {
if up.exitCodeFrom != "" {
up.cascadeStop = true
@@ -159,6 +173,9 @@
if create.recreateDeps && create.noRecreate {
return fmt.Errorf("--always-recreate-deps and --no-recreate are
incompatible")
}
+ if create.noBuild && up.watch {
+ return fmt.Errorf("--no-build and --watch are incompatible")
+ }
return nil
}
@@ -166,7 +183,6 @@
ctx context.Context,
dockerCli command.Cli,
backend api.Service,
- experimentals *experimental.State,
createOptions createOptions,
upOptions upOptions,
buildOptions buildOptions,
@@ -186,9 +202,6 @@
if err != nil {
return err
}
- if !upOptions.navigationMenuChanged {
- upOptions.navigationMenu = SetUnchangedOption(ComposeMenu,
experimentals.NavBar())
- }
var build *api.BuildOptions
if !createOptions.noBuild {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/cmd/formatter/logs.go
new/compose-2.26.1/cmd/formatter/logs.go
--- old/compose-2.26.0/cmd/formatter/logs.go 2024-03-22 18:16:27.000000000
+0100
+++ new/compose-2.26.1/cmd/formatter/logs.go 2024-03-28 18:57:26.000000000
+0100
@@ -102,8 +102,6 @@
l.write(l.stderr, container, message)
}
-var navColor = makeColorFunc("90")
-
func (l *logConsumer) write(w io.Writer, container, message string) {
if l.ctx.Err() != nil {
return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/cmd/formatter/shortcut.go
new/compose-2.26.1/cmd/formatter/shortcut.go
--- old/compose-2.26.0/cmd/formatter/shortcut.go 2024-03-22
18:16:27.000000000 +0100
+++ new/compose-2.26.1/cmd/formatter/shortcut.go 2024-03-28
18:57:26.000000000 +0100
@@ -187,7 +187,6 @@
}
func (lk *LogKeyboard) navigationMenu() string {
- var options string
var openDDInfo string
if lk.IsDockerDesktopActive {
openDDInfo = shortcutKeyColor("v") + navColor(" View in Docker
Desktop")
@@ -201,7 +200,7 @@
isEnabled = " Disable"
}
watchInfo = watchInfo + shortcutKeyColor("w") + navColor(isEnabled+"
Watch")
- return options + openDDInfo + watchInfo
+ return openDDInfo + watchInfo
}
func (lk *LogKeyboard) clearNavigationMenu() {
@@ -259,6 +258,12 @@
} else {
eg.Go(tracing.EventWrapFuncForErrGroup(ctx, "menu/watch",
tracing.SpanOptions{},
func(ctx context.Context) error {
+ if options.Create.Build == nil {
+ err := fmt.Errorf("Cannot run watch
mode with flag --no-build")
+ lk.keyboardError("Watch", err)
+ return err
+ }
+
lk.Watch.newContext(ctx)
buildOpts := *options.Create.Build
buildOpts.Quiet = true
@@ -270,10 +275,6 @@
}
}
-func (lk *LogKeyboard) KeyboardClose() {
- _ = keyboard.Close()
-}
-
func (lk *LogKeyboard) HandleKeyEvents(event keyboard.KeyEvent, ctx
context.Context, project *types.Project, options api.UpOptions) {
switch kRune := event.Rune; kRune {
case 'v':
@@ -283,8 +284,7 @@
}
switch key := event.Key; key {
case keyboard.KeyCtrlC:
- lk.KeyboardClose()
-
+ _ = keyboard.Close()
lk.clearNavigationMenu()
ShowCursor()
@@ -319,3 +319,7 @@
white := "255;255;255"
return ansiColor(foreground+";"+black+";"+background+";"+white, key,
BOLD)
}
+
+func navColor(key string) string {
+ return ansiColor(FAINT, key)
+}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/go.mod new/compose-2.26.1/go.mod
--- old/compose-2.26.0/go.mod 2024-03-22 18:16:27.000000000 +0100
+++ new/compose-2.26.1/go.mod 2024-03-28 18:57:26.000000000 +0100
@@ -31,7 +31,7 @@
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-rc6
+ github.com/opencontainers/image-spec v1.1.0
github.com/otiai10/copy v1.14.0
github.com/r3labs/sse v0.0.0-20210224172625-26fe804710bc
github.com/sirupsen/logrus v1.9.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/go.sum new/compose-2.26.1/go.sum
--- old/compose-2.26.0/go.sum 2024-03-22 18:16:27.000000000 +0100
+++ new/compose-2.26.1/go.sum 2024-03-28 18:57:26.000000000 +0100
@@ -380,8 +380,8 @@
github.com/opencontainers/go-digest v1.0.0
h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod
h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.0.1/go.mod
h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0=
-github.com/opencontainers/image-spec v1.1.0-rc6
h1:XDqvyKsJEbRtATzkgItUqBA7QHk58yxX1Ov9HERHNqU=
-github.com/opencontainers/image-spec v1.1.0-rc6/go.mod
h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/opencontainers/image-spec v1.1.0
h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
+github.com/opencontainers/image-spec v1.1.0/go.mod
h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
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.26.0/pkg/compose/pull.go
new/compose-2.26.1/pkg/compose/pull.go
--- old/compose-2.26.0/pkg/compose/pull.go 2024-03-22 18:16:27.000000000
+0100
+++ new/compose-2.26.1/pkg/compose/pull.go 2024-03-28 18:57:26.000000000
+0100
@@ -169,6 +169,14 @@
return ok && tagged.Tag() != "latest"
}
+func getUnwrappedErrorMessage(err error) string {
+ derr := errors.Unwrap(err)
+ if derr != nil {
+ return getUnwrappedErrorMessage(derr)
+ }
+ return err.Error()
+}
+
func (s *composeService) pullServiceImage(ctx context.Context, service
types.ServiceConfig,
configFile driver.Auth, w progress.Writer, quietPull bool,
defaultPlatform string) (string, error) {
w.Event(progress.Event{
@@ -200,18 +208,20 @@
// then the status should be warning instead of error
if err != nil && service.Build != nil {
w.Event(progress.Event{
- ID: service.Name,
- Status: progress.Warning,
- Text: "Warning",
+ ID: service.Name,
+ Status: progress.Warning,
+ Text: "Warning",
+ StatusText: getUnwrappedErrorMessage(err),
})
return "", WrapCategorisedComposeError(err, PullFailure)
}
if err != nil {
w.Event(progress.Event{
- ID: service.Name,
- Status: progress.Error,
- Text: "Error",
+ ID: service.Name,
+ Status: progress.Error,
+ Text: "Error",
+ StatusText: getUnwrappedErrorMessage(err),
})
return "", WrapCategorisedComposeError(err, PullFailure)
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.26.0/pkg/compose/up.go
new/compose-2.26.1/pkg/compose/up.go
--- old/compose-2.26.0/pkg/compose/up.go 2024-03-22 18:16:27.000000000
+0100
+++ new/compose-2.26.1/pkg/compose/up.go 2024-03-28 18:57:26.000000000
+0100
@@ -31,6 +31,7 @@
"github.com/docker/compose/v2/pkg/progress"
"github.com/eiannone/keyboard"
"github.com/hashicorp/go-multierror"
+ "github.com/sirupsen/logrus"
)
func (s *composeService) Up(ctx context.Context, project *types.Project,
options api.UpOptions) error { //nolint:gocyclo
@@ -90,20 +91,20 @@
}
var kEvents <-chan keyboard.KeyEvent
- isWatchConfigured := s.shouldWatch(project)
- isDockerDesktopActive := s.isDesktopIntegrationActive()
-
- tracing.KeyboardMetrics(ctx, options.Start.NavigationMenu,
isDockerDesktopActive, isWatchConfigured)
if options.Start.NavigationMenu {
kEvents, err = keyboard.GetKeys(100)
if err != nil {
- panic(err)
- }
- formatter.NewKeyboardManager(ctx,
isDockerDesktopActive, isWatchConfigured, signalChan, s.Watch)
- if options.Start.Watch {
- formatter.KeyboardManager.StartWatch(ctx,
project, options)
+ logrus.Warn("could not start menu, an error
occurred while starting.")
+ } else {
+ isWatchConfigured := s.shouldWatch(project)
+ isDockerDesktopActive :=
s.isDesktopIntegrationActive()
+ tracing.KeyboardMetrics(ctx,
options.Start.NavigationMenu, isDockerDesktopActive, isWatchConfigured)
+
+ formatter.NewKeyboardManager(ctx,
isDockerDesktopActive, isWatchConfigured, signalChan, s.Watch)
+ if options.Start.Watch {
+
formatter.KeyboardManager.StartWatch(ctx, project, options)
+ }
}
- defer formatter.KeyboardManager.KeyboardClose()
}
for {
select {
++++++ compose.obsinfo ++++++
--- /var/tmp/diff_new_pack.jGM7fY/_old 2024-04-02 16:43:08.226706275 +0200
+++ /var/tmp/diff_new_pack.jGM7fY/_new 2024-04-02 16:43:08.226706275 +0200
@@ -1,5 +1,5 @@
name: compose
-version: 2.26.0
-mtime: 1711127787
-commit: 3371227794f5f3645f4f19829c60a741635ed329
+version: 2.26.1
+mtime: 1711648646
+commit: ff20b641c7f1cce588faea476fbd1a6fdd953b36
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz
/work/SRC/openSUSE:Factory/.docker-compose.new.1905/vendor.tar.gz differ: char
5, line 1
