From 9928254c52794161aefb3f0b1b942c43833d425d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 15 Apr 2024 10:10:45 +0000
Subject: [PATCH] build(deps): Bump github.com/docker/docker from
26.0.0+incompatible to 26.0.1+incompatible (#684)
Bumps [github.com/docker/docker](https://github.com/docker/docker) from
26.0.0+incompatible to 26.0.1+incompatible.
Release notes
Sourced from github.com/docker/docker's
releases.
v26.0.1
26.0.1
For a full list of pull requests and changes in this release, refer
to the relevant GitHub milestones:
Bug fixes and enhancements
- Fix a regression that meant network interface specific
--sysctl options prevented container startup. moby/moby#47646
- Remove erroneous
platform from image
config OCI descriptor in docker save output.
moby/moby#47694
- containerd image store: OCI archives produced by
docker
save will now have a non-empty mediaType field in
index.json moby/moby#47701
- Fix a regression that prevented the internal resolver from
forwarding requests from IPvlan L3 networks to external resolvers. moby/moby#47705
- Prevent the use of external resolvers in IPvlan and Macvlan networks
created with no parent interface specified. moby/moby#47705
Packaging updates
Commits
60b9add
Merge pull request #47705
from robmry/backport-26.0/47662_ipvlan_l3_dns8ad7f86
Run ipvlan tests even if 'modprobe ipvlan' failsdc27552
Stop macvlan with no parent from using ext-dns7b570f0
Enable DNS proxying for ipvlan-l38cdcc4f
Move dummy DNS server to integration/internal/networked752f6
Merge pull request #47701
from vvoland/v26.0-476919db1b6f
Merge pull request #47702
from vvoland/v26.0-476476261281
Merge pull request #47700
from vvoland/v26.0-4767390355e5
Merge pull request #47696
from vvoland/v26.0-4765872615b1
github/ci: Check if backport is opened against the expected branch- Additional commits viewable in compare
view
[](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
Dependabot will resolve any conflicts with this PR as long as you don't
alter it yourself. You can also trigger a rebase manually by commenting
`@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits
that have been made to it
- `@dependabot merge` will merge this PR after your CI passes on it
- `@dependabot squash and merge` will squash and merge this PR after
your CI passes on it
- `@dependabot cancel merge` will cancel a previously requested merge
and block automerging
- `@dependabot reopen` will reopen this PR if it is closed
- `@dependabot close` will close this PR and stop Dependabot recreating
it. You can achieve the same result by closing it manually
- `@dependabot show ignore conditions` will show all
of the ignore conditions of the specified dependency
- `@dependabot ignore this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
go.mod | 2 +-
go.sum | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/go.mod b/go.mod
index b6f8e81d..444fabe5 100644
--- a/go.mod
+++ b/go.mod
@@ -13,7 +13,7 @@ require (
github.com/distribution/distribution/v3 v3.0.0-alpha.1
github.com/distribution/reference v0.6.0
github.com/docker/cli v26.0.1+incompatible
- github.com/docker/docker v26.0.0+incompatible
+ github.com/docker/docker v26.0.1+incompatible
github.com/docker/docker-credential-helpers v0.8.1
github.com/docker/go-connections v0.5.0
github.com/elazarl/goproxy v0.0.0-20230731152917-f99041a5c027
diff --git a/go.sum b/go.sum
index 3b5938fa..2545e668 100644
--- a/go.sum
+++ b/go.sum
@@ -326,8 +326,8 @@ github.com/docker/cli v26.0.1+incompatible h1:eZDuplk2jYqgUkNLDYwTBxqmY9cM3yHnmN
github.com/docker/cli v26.0.1+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvMKP+vjCwu2uszcLI8=
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 v26.0.0+incompatible h1:Ng2qi+gdKADUa/VM+6b6YaY2nlZhk/lVJiKR/2bMudU=
-github.com/docker/docker v26.0.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
+github.com/docker/docker v26.0.1+incompatible h1:t39Hm6lpXuXtgkF0dm1t9a5HkbUfdGy6XbWexmGr+hA=
+github.com/docker/docker v26.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=