Merge pull request #6025 from thaJeztah/bump_compose

Dockerfile: update compose to v2.35.1
2025-04-18 09:44:47 +00:00 · 2025-04-18 00:04:38 +02:00 · 2025-04-17 17:02:28 +02:00 · 2025-04-17 16:12:40 +02:00
4 changed files with 5 additions and 5 deletions
--- a/2
+++ b/2
@ -13,7 +13,7 @@ ARG GOTESTSUM_VERSION=v1.12.0
 # It must be a tag in the docker.io/docker/buildx-bin image repository
 # on Docker Hub.
 ARG BUILDX_VERSION=0.23.0
-ARG COMPOSE_VERSION=v2.33.1
+ARG COMPOSE_VERSION=v2.35.1

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

--- a/vendor.mod
+++ b/vendor.mod
@ -14,7 +14,7 @@ require (
 	github.com/distribution/reference v0.6.0
 	github.com/docker/cli-docs-tool v0.9.0
 	github.com/docker/distribution v2.8.3+incompatible
-	github.com/docker/docker v28.1.0-rc.2+incompatible
+	github.com/docker/docker v28.1.0+incompatible
 	github.com/docker/docker-credential-helpers v0.9.2
 	github.com/docker/go-connections v0.5.0
 	github.com/docker/go-units v0.5.0
--- a/vendor.sum
+++ b/vendor.sum
@ -52,8 +52,8 @@ github.com/docker/cli-docs-tool v0.9.0/go.mod h1:ClrwlNW+UioiRyH9GiAOe1o3J/TsY3T
 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 v28.1.0-rc.2+incompatible h1:aLcEy4huVaL/jNS7hJNsGZbqGv+g6+AJ7hWE042Abmk=
-github.com/docker/docker v28.1.0-rc.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v28.1.0+incompatible h1:4iqpcWQCt3Txcz7iWIb1U3SZ/n9ffo4U+ryY5/3eOp0=
+github.com/docker/docker v28.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.9.2 h1:50JF7ADQiHdAVBRtg/vy883Y4U5+5GmPOBNtUU+X+6A=
 github.com/docker/docker-credential-helpers v0.9.2/go.mod h1:x+4Gbw9aGmChi3qTLZj8Dfn0TD20M/fuWy0E5+WDeCo=
 github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@ -58,7 +58,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 v28.1.0-rc.2+incompatible
+# github.com/docker/docker v28.1.0+incompatible
 ## explicit
 github.com/docker/docker/api
 github.com/docker/docker/api/types
Author	SHA1	Message	Date
Paweł Gronowski	4eba377327	Merge pull request #6025 from thaJeztah/bump_compose Some checks failed build / bin-image (push) Has been cancelled Details build / prepare-plugins (push) Has been cancelled Details build / plugins (push) Has been cancelled Details codeql / codeql (push) Has been cancelled Details e2e / tests (alpine, 23, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 23, local) (push) Has been cancelled Details e2e / tests (alpine, 26, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 26, local) (push) Has been cancelled Details e2e / tests (alpine, 27, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 27, local) (push) Has been cancelled Details e2e / tests (alpine, 28, connhelper-ssh) (push) Has been cancelled Details e2e / tests (alpine, 28, local) (push) Has been cancelled Details e2e / tests (debian, 23, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 23, local) (push) Has been cancelled Details e2e / tests (debian, 26, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 26, local) (push) Has been cancelled Details e2e / tests (debian, 27, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 27, local) (push) Has been cancelled Details e2e / tests (debian, 28, connhelper-ssh) (push) Has been cancelled Details e2e / tests (debian, 28, local) (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 Dockerfile: update compose to v2.35.1	2025-04-18 09:44:47 +00:00
Sebastiaan van Stijn	9cd35577fc	Dockerfile: update compose to v2.35.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-04-18 00:04:38 +02:00
Sebastiaan van Stijn	cf87480ab5	Merge pull request #6020 from thaJeztah/bump_engine_28.1 vendor: github.com/docker/docker v28.1.0	2025-04-17 17:02:28 +02:00
Sebastiaan van Stijn	adb0d29504	vendor: github.com/docker/docker v28.1.0 no diff; same commit, but tagged full diff: https://github.com/docker/docker/compare/v28.1.0-rc.2...v28.1.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-04-17 16:12:40 +02:00