Merge pull request #5462 from thaJeztah/27.x_backport_bump_compose

[27.x] Dockerfile: update compose to v2.29.7
Merge pull request #5461 from laurazard/27.x-backport-update-VERSION
2024-09-20 12:01:47 +01:00 · 2024-09-20 11:48:12 +01:00 · 2024-09-20 11:41:57 +01:00 · 2024-09-20 12:41:56 +02:00 · 2024-09-20 11:23:44 +01:00 · 2024-09-20 12:13:41 +02:00
6 changed files with 11 additions and 9 deletions
--- a/2
+++ b/2
@ -9,7 +9,7 @@ ARG XX_VERSION=1.5.0
 ARG GOVERSIONINFO_VERSION=v1.3.0
 ARG GOTESTSUM_VERSION=v1.10.0
 ARG BUILDX_VERSION=0.17.1
-ARG COMPOSE_VERSION=v2.29.4
+ARG COMPOSE_VERSION=v2.29.7

 FROM --platform=$BUILDPLATFORM tonistiigi/xx:${XX_VERSION} AS xx

--- a/2
+++ b/2
@ -1 +1 @@
-27.0.1-dev
+27.3.1-dev
--- a/cmd/docker/docker.go
+++ b/cmd/docker/docker.go
@ -360,9 +360,11 @@ func runDocker(ctx context.Context, dockerCli *command.DockerCli) error {

 	mp := dockerCli.MeterProvider()
 	if mp, ok := mp.(command.MeterProvider); ok {
-		if err := mp.Shutdown(ctx); err != nil {
-			otel.Handle(err)
-		}
+		defer func() {
+			if err := mp.Shutdown(ctx); err != nil {
+				otel.Handle(err)
+			}
+		}()
 	} else {
 		fmt.Fprint(dockerCli.Err(), "Warning: Unexpected OTEL error, metrics may not be flushed")
 	}
--- a/vendor.mod
+++ b/vendor.mod
@ -13,7 +13,7 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli-docs-tool v0.8.0
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v27.3.0-rc.2+incompatible
+	github.com/docker/docker v27.3.0+incompatible
 	github.com/docker/docker-credential-helpers v0.8.2
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
--- a/vendor.sum
+++ b/vendor.sum
@ -57,8 +57,8 @@ github.com/docker/cli-docs-tool v0.8.0/go.mod h1:8TQQ3E7mOXoYUs811LiPdUnAhXrcVsB
 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 v27.3.0-rc.2+incompatible h1:+WSuhLOwbip2IuVKZ4ecSQfG/grbPw96d3b7jBC8MSQ=
-github.com/docker/docker v27.3.0-rc.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v27.3.0+incompatible h1:BNb1QY6o4JdKpqwi9IB+HUYcRRrVN4aGFUTvDmWYK1A=
+github.com/docker/docker v27.3.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.8.2 h1:bX3YxiGzFP5sOXWc3bTPEXdEaZSeVMrFgOr3T+zrFAo=
 github.com/docker/docker-credential-helpers v0.8.2/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@ -55,7 +55,7 @@ github.com/docker/distribution/registry/client/transport
 github.com/docker/distribution/registry/storage/cache
 github.com/docker/distribution/registry/storage/cache/memory
 github.com/docker/distribution/uuid
-# github.com/docker/docker v27.3.0-rc.2+incompatible
+# github.com/docker/docker v27.3.0+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
Laura Brehm	ce1223035a	Merge pull request #5462 from thaJeztah/27.x_backport_bump_compose Some checks failed build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / e2e (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 23, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (alpine, 27, experimental) (push) Has been cancelled Details e2e / e2e (alpine, 27, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 23, experimental) (push) Has been cancelled Details e2e / e2e (debian, 23, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 26.1, experimental) (push) Has been cancelled Details e2e / e2e (debian, 26.1, non-experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, connhelper-ssh) (push) Has been cancelled Details e2e / e2e (debian, 27, experimental) (push) Has been cancelled Details e2e / e2e (debian, 27, non-experimental) (push) Has been cancelled Details test / ctn (push) Has been cancelled Details test / host (macos-13) (push) Has been cancelled Details test / host (macos-14) (push) Has been cancelled Details validate / validate (lint) (push) Has been cancelled Details validate / validate (shellcheck) (push) Has been cancelled Details validate / validate (update-authors) (push) Has been cancelled Details validate / validate (validate-vendor) (push) Has been cancelled Details validate / validate-md (push) Has been cancelled Details validate / validate-make (manpages) (push) Has been cancelled Details validate / validate-make (yamldocs) (push) Has been cancelled Details [27.x] Dockerfile: update compose to v2.29.7	2024-09-20 12:01:47 +01:00
Laura Brehm	263ba959c4	Merge pull request #5461 from laurazard/27.x-backport-update-VERSION	2024-09-20 11:48:12 +01:00
Laura Brehm	be9b9f3d70	Update `VERSION` file to `v27.3.1-dev` Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit `91c90a9797`) Signed-off-by: Laura Brehm <laurabrehm@hey.com>	2024-09-20 11:41:57 +01:00
Sebastiaan van Stijn	a4149b0c3d	Dockerfile: update compose to v2.29.7 Update the compose cli plugin used in the dev-container full diff: https://github.com/docker/compose/compare/v2.29.4...v2.29.7 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit `ce26ebc0e9`) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-09-20 12:41:56 +02:00
Laura Brehm	4aac4154b0	Merge pull request #5458 from thaJeztah/27.x_bump_engine3 [27.x] vendor: github.com/docker/docker v27.3.0	2024-09-20 11:23:44 +01:00
Sebastiaan van Stijn	854695884a	vendor: github.com/docker/docker v27.3.0 no diff, just re-tagged; https://github.com/docker/docker/compare/v27.3.0-rc.2...v27.3.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-09-20 12:13:41 +02:00
Laura Brehm	f05200311d	Merge pull request #5457 from laurazard/backport-dropped-defer [27.x backport] telemetry: fix early meterprovider shutdown	2024-09-20 01:49:45 +01:00
Laura Brehm	460f1becc5	telemetry: fix early meterprovider shutdown In `4b5a196fee`, we changed the CLI global meter provider shutdown in order to handle any error returned by the metric export. Unfortunately, we dropped a `defer` during the fix, which causes the meter provider to be immediately shutdown after being created and metrics to not be collected/exporter. Signed-off-by: Laura Brehm <laurabrehm@hey.com> (cherry picked from commit `1355d7e9f8`) Signed-off-by: Laura Brehm <laurabrehm@hey.com>	2024-09-20 01:37:00 +01:00