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-02-01 18:05:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/docker-compose (Old)
and /work/SRC/openSUSE:Factory/.docker-compose.new.1815 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "docker-compose"
Thu Feb 1 18:05:04 2024 rev:35 rq:1143185 version:2.24.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/docker-compose/docker-compose.changes
2024-01-30 18:27:21.110134341 +0100
+++ /work/SRC/openSUSE:Factory/.docker-compose.new.1815/docker-compose.changes
2024-02-01 18:05:33.331454405 +0100
@@ -1,0 +2,9 @@
+Thu Feb 01 06:26:07 UTC 2024 - opensuse_buildserv...@ojkastl.de
+
+- Update to version 2.24.5:
+ * chore(e2e): fix flaky test & standalone behavior (#11382)
+ * ci(deps): replace buildkit to fix fsutil issues on Windows
+ (#11426)
+ * Fix canonical container name
+
+-------------------------------------------------------------------
Old:
----
compose-2.24.4.obscpio
New:
----
compose-2.24.5.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ docker-compose.spec ++++++
--- /var/tmp/diff_new_pack.ztIvQP/_old 2024-02-01 18:05:36.079553835 +0100
+++ /var/tmp/diff_new_pack.ztIvQP/_new 2024-02-01 18:05:36.083553979 +0100
@@ -19,7 +19,7 @@
%define __arch_install_post export NO_BRP_STRIP_DEBUG=true
Name: docker-compose
-Version: 2.24.4
+Version: 2.24.5
Release: 0
Summary: Define and run multi-container applications with Docker
License: Apache-2.0
++++++ _service ++++++
--- /var/tmp/diff_new_pack.ztIvQP/_old 2024-02-01 18:05:36.107554847 +0100
+++ /var/tmp/diff_new_pack.ztIvQP/_new 2024-02-01 18:05:36.111554993 +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.4</param>
+ <param name="revision">v2.24.5</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.4.obscpio</param>
+ <param name="archive">compose-2.24.5.obscpio</param>
</service>
</services>
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.ztIvQP/_old 2024-02-01 18:05:36.131555716 +0100
+++ /var/tmp/diff_new_pack.ztIvQP/_new 2024-02-01 18:05:36.135555861 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/docker/compose</param>
- <param
name="changesrevision">ac8ea082a113327905f88604dfd6b8daca7fc8b1</param></service></servicedata>
+ <param
name="changesrevision">8fdd45cd4ce0035968efef3cae44529690fbea60</param></service></servicedata>
(No newline at EOF)
++++++ compose-2.24.4.obscpio -> compose-2.24.5.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.24.4/go.mod new/compose-2.24.5/go.mod
--- old/compose-2.24.4/go.mod 2024-01-29 20:11:13.000000000 +0100
+++ new/compose-2.24.5/go.mod 2024-01-30 16:49:53.000000000 +0100
@@ -183,6 +183,8 @@
tags.cncf.io/container-device-interface v0.6.2 // indirect
)
-// Fix an issue with fsutil v0.0.0-20230825212630-f09800878302 on Windows
-// See https://github.com/docker/buildx/issues/2207#issuecomment-1908460460
-replace github.com/tonistiigi/fsutil v0.0.0-20230825212630-f09800878302 =>
github.com/crazy-max/fsutil v0.0.0-20240124164449-376dc28ff40f
+replace (
+ // reverts https://github.com/moby/buildkit/pull/4094 to fix fsutil
issues on Windows
+ github.com/moby/buildkit => github.com/crazy-max/buildkit
v0.7.1-0.20240130133234-d9aa289bd124 // compose-957cb50df991
+ github.com/tonistiigi/fsutil => github.com/tonistiigi/fsutil
v0.0.0-20230629203738-36ef4d8c0dbb
+)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.24.4/go.sum new/compose-2.24.5/go.sum
--- old/compose-2.24.4/go.sum 2024-01-29 20:11:13.000000000 +0100
+++ new/compose-2.24.5/go.sum 2024-01-30 16:49:53.000000000 +0100
@@ -110,8 +110,8 @@
github.com/containerd/typeurl/v2 v2.1.1
h1:3Q4Pt7i8nYwy2KmQWIw2+1hTvwTE/6w9FqcttATPO/4=
github.com/containerd/typeurl/v2 v2.1.1/go.mod
h1:IDp2JFvbwZ31H8dQbEIY7sDl2L3o3HZj1hsSQlywkQ0=
github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod
h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
-github.com/crazy-max/fsutil v0.0.0-20240124164449-376dc28ff40f
h1:f+sk5oEeSYL/2tjWraiDlR/JHJVwtqKYpGtMkfJ7MTc=
-github.com/crazy-max/fsutil v0.0.0-20240124164449-376dc28ff40f/go.mod
h1:9kMVqMyQ/Sx2df5LtnGG+nbrmiZzCS7V6gjW3oGHsvI=
+github.com/crazy-max/buildkit v0.7.1-0.20240130133234-d9aa289bd124
h1:rTTqpfm06GSf2gjt8oo9LfUm2iGiYtx1VUDPfTHXqs4=
+github.com/crazy-max/buildkit v0.7.1-0.20240130133234-d9aa289bd124/go.mod
h1:eFZFY7VaoWWKmJLwkqmcWR6x0j8q+gXcngg3E4k0558=
github.com/creack/pty v1.1.9/go.mod
h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/creack/pty v1.1.17/go.mod
h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/creack/pty v1.1.18 h1:n56/Zwd5o6whRC5PMGretI4IdRLlmBXYNjScPaBgsbY=
@@ -336,8 +336,6 @@
github.com/mitchellh/mapstructure v1.5.0/go.mod
h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
github.com/mitchellh/reflectwalk v1.0.2
h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
github.com/mitchellh/reflectwalk v1.0.2/go.mod
h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991
h1:r80LLQ91uOLxU1ElAvrB1o8oBsph51lPzVnr7t2b200=
-github.com/moby/buildkit v0.13.0-beta1.0.20231219135447-957cb50df991/go.mod
h1:6MddWPSL5jxy+W8eMMHWDOfZzzRRKWXPZqajw72YHBc=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
github.com/moby/locker v1.0.1/go.mod
h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/patternmatcher v0.6.0
h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
@@ -472,6 +470,8 @@
github.com/theupdateframework/notary v0.7.0/go.mod
h1:c9DRxcmhHmVLDay4/2fUYdISnHqbFDGRSlXPO0AhYWw=
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375
h1:QB54BJwA6x8QU9nHY3xJSZR2kX9bgpZekRKGkLTmEXA=
github.com/tilt-dev/fsnotify v1.4.8-0.20220602155310-fff9c274a375/go.mod
h1:xRroudyp5iVtxKqZCrA6n2TLFRBf8bmnjr1UD4x+z7g=
+github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb
h1:uUe8rNyVXM8moActoBol6Xf6xX2GMr7SosR2EywMvGg=
+github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb/go.mod
h1:SxX/oNQ/ag6Vaoli547ipFK9J7BZn5JqJG0JE8lf8bA=
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
h1:SXhTLE6pb6eld/v/cCndK0AMpt1wiVFb/YYmqB3/QG0=
github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea/go.mod
h1:WPnis/6cRcDZSUvVmezrxJPkiO87ThFYsoUiMwWNDJk=
github.com/tonistiigi/vt100 v0.0.0-20230623042737-f9a4f7ef6531
h1:Y/M5lygoNPKwVNLMPXgVfsRT40CSFKXCxuU8LoHySjs=
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.24.4/pkg/compose/compose.go
new/compose-2.24.5/pkg/compose/compose.go
--- old/compose-2.24.4/pkg/compose/compose.go 2024-01-29 20:11:13.000000000
+0100
+++ new/compose-2.24.5/pkg/compose/compose.go 2024-01-30 16:49:53.000000000
+0100
@@ -132,7 +132,8 @@
return name[1:]
}
}
- return c.Names[0][1:]
+
+ return strings.TrimPrefix(c.Names[0], "/")
}
func getContainerNameWithoutProject(c moby.Container) string {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.24.4/pkg/e2e/cancel_test.go
new/compose-2.24.5/pkg/e2e/cancel_test.go
--- old/compose-2.24.4/pkg/e2e/cancel_test.go 2024-01-29 20:11:13.000000000
+0100
+++ new/compose-2.24.5/pkg/e2e/cancel_test.go 2024-01-30 16:49:53.000000000
+0100
@@ -37,18 +37,26 @@
c := NewParallelCLI(t)
t.Run("metrics on cancel Compose build", func(t *testing.T) {
- c.RunDockerComposeCmd(t, "ls")
- buildProjectPath := "fixtures/build-infinite/compose.yaml"
+ const buildProjectPath = "fixtures/build-infinite/compose.yaml"
+
+ ctx, cancel := context.WithCancel(context.Background())
+ defer cancel()
// require a separate groupID from the process running tests,
in order to simulate ctrl+C from a terminal.
// sending kill signal
- stdout := &utils.SafeBuffer{}
- stderr := &utils.SafeBuffer{}
- cmd, err := StartWithNewGroupID(context.Background(),
+ var stdout, stderr utils.SafeBuffer
+ cmd, err := StartWithNewGroupID(
+ ctx,
c.NewDockerComposeCmd(t, "-f", buildProjectPath,
"build", "--progress", "plain"),
- stdout,
- stderr)
+ &stdout,
+ &stderr,
+ )
assert.NilError(t, err)
+ processDone := make(chan error, 1)
+ go func() {
+ defer close(processDone)
+ processDone <- cmd.Wait()
+ }()
c.WaitForCondition(t, func() (bool, string) {
out := stdout.String()
@@ -58,15 +66,21 @@
errors)
}, 30*time.Second, 1*time.Second)
- err = syscall.Kill(-cmd.Process.Pid, syscall.SIGINT) //
simulate Ctrl-C : send signal to processGroup, children will have same groupId
by default
+ // simulate Ctrl-C : send signal to processGroup, children will
have same groupId by default
+ err = syscall.Kill(-cmd.Process.Pid, syscall.SIGINT)
assert.NilError(t, err)
- c.WaitForCondition(t, func() (bool, string) {
- out := stdout.String()
- errors := stderr.String()
- return strings.Contains(out, "CANCELED"),
fmt.Sprintf("'CANCELED' not found in : \n%s\nStderr: \n%s\n", out,
- errors)
- }, 10*time.Second, 1*time.Second)
+ select {
+ case <-ctx.Done():
+ t.Fatal("test context canceled")
+ case err := <-processDone:
+ // TODO(milas): Compose should really not return exit
code 130 here,
+ // this is an old hack for the compose-cli wrapper
+ assert.Error(t, err, "exit status 130",
+ "STDOUT:\n%s\nSTDERR:\n%s\n", stdout.String(),
stderr.String())
+ case <-time.After(10 * time.Second):
+ t.Fatal("timeout waiting for Compose exit")
+ }
})
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/compose-2.24.4/pkg/e2e/e2e_config_plugin.go
new/compose-2.24.5/pkg/e2e/e2e_config_plugin.go
--- old/compose-2.24.4/pkg/e2e/e2e_config_plugin.go 2024-01-29
20:11:13.000000000 +0100
+++ new/compose-2.24.5/pkg/e2e/e2e_config_plugin.go 2024-01-30
16:49:53.000000000 +0100
@@ -18,4 +18,4 @@
package e2e
-const composeStandaloneMode = true
+const composeStandaloneMode = false
++++++ compose.obsinfo ++++++
--- /var/tmp/diff_new_pack.ztIvQP/_old 2024-02-01 18:05:36.367564255 +0100
+++ /var/tmp/diff_new_pack.ztIvQP/_new 2024-02-01 18:05:36.371564400 +0100
@@ -1,5 +1,5 @@
name: compose
-version: 2.24.4
-mtime: 1706555473
-commit: ac8ea082a113327905f88604dfd6b8daca7fc8b1
+version: 2.24.5
+mtime: 1706629793
+commit: 8fdd45cd4ce0035968efef3cae44529690fbea60
++++++ vendor.tar.gz ++++++
/work/SRC/openSUSE:Factory/docker-compose/vendor.tar.gz
/work/SRC/openSUSE:Factory/.docker-compose.new.1815/vendor.tar.gz differ: char
5, line 1
