Bump github.com/docker/docker from 20.10.23+incompatible to 23.0.4+incompatible (#11259)
Bumps [github.com/docker/docker](https://github.com/docker/docker) from 20.10.23+incompatible to 23.0.4+incompatible. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/docker/docker/releases">github.com/docker/docker's releases</a>.</em></p> <blockquote> <h2>v23.0.4</h2> <h2>23.0.4</h2> <p>For a full list of pull requests and changes in this release, refer to the relevant GitHub milestones:</p> <ul> <li><a href="https://github.com/docker/cli/milestone/77?closed=1">docker/cli, 23.0.4 milestone</a></li> <li><a href="https://github.com/moby/moby/milestone/117?closed=1">moby/moby, 23.0.4 milestone</a></li> </ul> <h3>Bug fixes and enhancements</h3> <ul> <li>Fix a performance regression in Docker CLI 23.0.0 <a href="https://redirect.github.com/docker/cli/pull/4141">docker/cli#4141</a>.</li> <li>Fix progress indicator on <code>docker cp</code> not functioning as intended <a href="https://redirect.github.com/docker/cli/pull/4157">docker/cli#4157</a>.</li> <li>Fix shell completion for <code>docker compose --file</code> <a href="https://redirect.github.com/docker/cli/pull/4177">docker/cli#4177</a>.</li> <li>Fix an error caused by incorrect handling of "default-address-pools" in <code>daemon.json</code> <a href="https://redirect.github.com/moby/moby/pull/45246">moby/moby#45246</a>.</li> </ul> <h3>Packaging Updates</h3> <ul> <li>Fix missing packages for CentOS 9 Stream.</li> <li>Upgrade Go to <code>1.19.8</code>. <a href="https://redirect.github.com/docker/docker-ce-packaging/pull/878">docker/docker-ce-packaging#878</a>, <a href="https://redirect.github.com/docker/cli/pull/4164">docker/cli#4164</a>, <a href="https://redirect.github.com/moby/moby/pull/45277">moby/moby#45277</a>, which contains fixes for <a href="https://github.com/advisories/GHSA-fp86-2355-v99r">CVE-2023-24537</a>, <a href="https://github.com/advisories/GHSA-v4m2-x4rp-hv22">CVE-2023-24538</a>, <a href="https://github.com/advisories/GHSA-8v5j-pwr7-w5f8">CVE-2023-24534</a>, and <a href="https://github.com/advisories/GHSA-9f7g-gqwh-jpf5">CVE-2023-24536</a></li> </ul> <h2>v23.0.3</h2> <h2>23.0.3</h2> <blockquote> <p><strong>Note</strong></p> <p>Due to an issue with CentOS 9 Stream's package repositories, packages for CentOS 9 are currently unavailable. Packages for CentOS 9 may be added later, or as part of the next (23.0.4) patch release.</p> </blockquote> <h3>Bug fixes and enhancements</h3> <ul> <li>Fixed a number of issues that can cause Swarm encrypted overlay networks to fail to uphold their guarantees, addressing <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-28841">CVE-2023-28841</a>, <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-28840">CVE-2023-28840</a>, and <a href="https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2023-28842">CVE-2023-28842</a>. <ul> <li>A lack of kernel support for encrypted overlay networks now reports as an error.</li> <li>Encrypted overlay networks are eagerly set up, rather than waiting for multiple nodes to attach.</li> <li>Encrypted overlay networks are now usable on Red Hat Enterprise Linux 9 through the use of the <code>xt_bpf</code> kernel module.</li> <li>Users of Swarm overlay networks should review <a href="https://github.com/moby/moby/security/advisories/GHSA-vwm3-crmr-xfxw">GHSA-vwm3-crmr-xfxw</a> to ensure that unintentional exposure has not occurred.</li> </ul> </li> </ul> <!-- raw HTML omitted --> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/moby/moby/commit/cbce3319305c39df3405c969a12e0a5d2bad3f4f"><code>cbce331</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45330">#45330</a> from kevingentile/buildkit-3770</li> <li><a href="https://github.com/moby/moby/commit/5f684cb0721bccade3251b450b1cda043ae18d95"><code>5f684cb</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45331">#45331</a> from thaJeztah/23.0_backport_rootless_script_bugs</li> <li><a href="https://github.com/moby/moby/commit/3731ce10d43064dced009f8f8591f70205d2bb0b"><code>3731ce1</code></a> Fix argument quoting bugs in dockerd-rootless.sh</li> <li><a href="https://github.com/moby/moby/commit/23774ada04cacf85cdda55988657b23eb717b8e0"><code>23774ad</code></a> vendor: github.com/moby/buildkit v0.10.7-0.20230412161310-d52b2d584242</li> <li><a href="https://github.com/moby/moby/commit/90e8a0bbf57afeb7da47c9027c4de3abf02c2bd5"><code>90e8a0b</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45323">#45323</a> from thaJeztah/23.0_backport_vendor_sctp</li> <li><a href="https://github.com/moby/moby/commit/9277e644442e5e0f720d7539d38d4a4402d1ba55"><code>9277e64</code></a> vendor: github.com/ishidawataru/sctp v0.0.0-20230406120618-7ff4192f6ff2</li> <li><a href="https://github.com/moby/moby/commit/cdb6200887b4e6ce668c1a1e2436f321ea6c7936"><code>cdb6200</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45293">#45293</a> from AkihiroSuda/backport-45283-23</li> <li><a href="https://github.com/moby/moby/commit/09fbbd56774f579dae9a5554c5864879fe9381c8"><code>09fbbd5</code></a> docker-rootless-setuptools.sh: improve readability of messages</li> <li><a href="https://github.com/moby/moby/commit/4ca4705bf777c5c9e432f9a5d7d2926a37788a69"><code>4ca4705</code></a> Merge pull request <a href="https://redirect.github.com/docker/docker/issues/45277">#45277</a> from thaJeztah/23.0_bump_go1.19.8</li> <li><a href="https://github.com/moby/moby/commit/d3e52936c3da962a9bd5ecec242130d5790ee88e"><code>d3e5293</code></a> [23.0] update go to go1.19.8</li> <li>Additional commits viewable in <a href="https://github.com/docker/docker/compare/v20.10.23...v23.0.4">compare view</a></li> </ul> </details> <br /> [](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) </details> --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Zach Wasserman <zach@fleetdm.com>
This commit is contained in:
dependabot[bot]
co-authored by
Zach Wasserman
Zach Wasserman
parent
d524151eec
commit
23a2964eef
@@ -21,7 +21,7 @@ require (
|
||||
github.com/davecgh/go-spew v1.1.1
|
||||
github.com/dgraph-io/badger/v2 v2.2007.2
|
||||
github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e
|
||||
github.com/docker/docker v20.10.23+incompatible
|
||||
github.com/docker/docker v23.0.4+incompatible
|
||||
github.com/docker/go-units v0.4.0
|
||||
github.com/doug-martin/goqu/v9 v9.18.0
|
||||
github.com/e-dard/netbug v0.0.0-20151029172837-e64d308a0b20
|
||||
@@ -271,7 +271,6 @@ require (
|
||||
github.com/santhosh-tekuri/jsonschema v1.2.4 // indirect
|
||||
github.com/secure-systems-lab/go-securesystemslib v0.4.0 // indirect
|
||||
github.com/sergi/go-diff v1.2.0 // indirect
|
||||
github.com/sirupsen/logrus v1.9.0 // indirect
|
||||
github.com/slack-go/slack v0.9.4 // indirect
|
||||
github.com/spf13/afero v1.6.0 // indirect
|
||||
github.com/spf13/jwalterweatherman v1.1.0 // indirect
|
||||
|
||||
@@ -379,8 +379,8 @@ github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/
|
||||
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||
github.com/docker/distribution v2.8.0+incompatible h1:l9EaZDICImO1ngI+uTifW+ZYvvz7fKISBAKpg+MbWbY=
|
||||
github.com/docker/distribution v2.8.0+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
|
||||
github.com/docker/docker v20.10.23+incompatible h1:1ZQUUYAdh+oylOT85aA2ZcfRp22jmLhoaEcVEfK8dyA=
|
||||
github.com/docker/docker v20.10.23+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v23.0.4+incompatible h1:Kd3Bh9V/rO+XpTP/BLqM+gx8z7+Yb0AA2Ibj+nNo4ek=
|
||||
github.com/docker/docker v23.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/go v1.5.1-1/go.mod h1:CADgU4DSXK5QUlFslkQu2yW2TKzFZcXq/leZfM0UH5Q=
|
||||
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
|
||||
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
|
||||
@@ -1132,7 +1132,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
|
||||
github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
|
||||
github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
|
||||
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
|
||||
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
|
||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 h1:JIAuq3EEf9cgbU6AtGPK4CTG3Zf6CKMNqf0MHTggAUA=
|
||||
github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod h1:sUM3LWHvSMaG192sy56D9F7CNvL7jUJVXoqM1QKLnog=
|
||||
github.com/slack-go/slack v0.9.4 h1:C+FC3zLxLxUTQjDy2RZeMHYon005zsCROiZNWVo+opQ=
|
||||
@@ -1608,7 +1607,6 @@ golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBc
|
||||
golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
||||
|
||||
@@ -53,7 +53,7 @@ func NewFleet(t *testing.T, version string) *Fleet {
|
||||
//nolint:gosec // does not need to be secure for tests
|
||||
projectName := "fleet-test-" + strconv.FormatUint(rand.Uint64(), 16)
|
||||
|
||||
dockerClient, err := client.NewClientWithOpts(client.FromEnv)
|
||||
dockerClient, err := client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
|
||||
if err != nil {
|
||||
t.Fatalf("create docker client: %v", err)
|
||||
}
|
||||
@@ -161,7 +161,6 @@ func (f *Fleet) setupFleet() error {
|
||||
}
|
||||
|
||||
func (f *Fleet) waitMYSQL() error {
|
||||
|
||||
// get the random mysql host port assigned by docker
|
||||
port, err := f.getPublicPort("mysql", 3306)
|
||||
if err != nil {
|
||||
@@ -259,7 +258,6 @@ func (f *Fleet) cleanup() {
|
||||
}
|
||||
|
||||
func (f *Fleet) execCompose(env map[string]string, args ...string) (string, error) {
|
||||
|
||||
// docker compose variables via environment eg FLEET_VERSION_A
|
||||
e := os.Environ()
|
||||
for k, v := range env {
|
||||
|
||||
Reference in New Issue
Block a user