deps: update docker to 23.0.3 (#16862)

* [no ci] deps: update docker to 23.0.3 This PR brings our docker/docker dependency (which is hosted at github.com/moby/moby) up to 23.0.3 (forward about 2 years). Refactored our use of docker/libnetwork to reference the package in its new home, which is docker/docker/libnetwork (it is no longer an independent repository). Some minor nearby test case cleanup as well. * add cl
hashicorp · May 23, 2023 · d880ea9 · d880ea9
1 parent 34389d1
commit d880ea9
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 493 deletions.
diff --git a/.changelog/16862.txt b/.changelog/16862.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+deps: update docker to 23.0.3
+```
diff --git a/drivers/docker/driver_test.go b/drivers/docker/driver_test.go
@@ -1479,10 +1479,10 @@ func TestDockerDriver_DNS(t *testing.T) {
 		require.NoError(t, task.EncodeConcreteDriverConfig(cfg))
 
 		_, d, _, cleanup := dockerSetup(t, task, nil)
-		defer cleanup()
+		t.Cleanup(cleanup)
 
 		require.NoError(t, d.WaitUntilStarted(task.ID, 5*time.Second))
-		defer d.DestroyTask(task.ID, true)
+		t.Cleanup(func() { _ = d.DestroyTask(task.ID, true) })
 
 		dtestutil.TestTaskDNSConfig(t, d, task.ID, c.cfg)
 	}

diff --git a/drivers/shared/resolvconf/mount.go b/drivers/shared/resolvconf/mount.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	dresolvconf "github.com/docker/libnetwork/resolvconf"
-	"github.com/docker/libnetwork/types"
+	"github.com/docker/docker/libnetwork/resolvconf"
+	"github.com/docker/docker/libnetwork/types"
 	"github.com/hashicorp/nomad/plugins/drivers"
 )
 
@@ -34,15 +34,15 @@ func GenerateDNSMount(taskDir string, conf *drivers.DNSConfig) (*drivers.MountCo
 		return mount, nil
 	}
 
-	currRC, err := dresolvconf.Get()
+	currRC, err := resolvconf.Get()
 	if err != nil {
 		return nil, err
 	}
 
 	var (
-		dnsList        = dresolvconf.GetNameservers(currRC.Content, types.IP)
-		dnsSearchList  = dresolvconf.GetSearchDomains(currRC.Content)
-		dnsOptionsList = dresolvconf.GetOptions(currRC.Content)
+		dnsList        = resolvconf.GetNameservers(currRC.Content, types.IP)
+		dnsSearchList  = resolvconf.GetSearchDomains(currRC.Content)
+		dnsOptionsList = resolvconf.GetOptions(currRC.Content)
 	)
 	if nServers > 0 {
 		dnsList = conf.Servers
@@ -54,25 +54,27 @@ func GenerateDNSMount(taskDir string, conf *drivers.DNSConfig) (*drivers.MountCo
 		dnsOptionsList = conf.Options
 	}
 
-	_, err = dresolvconf.Build(path, dnsList, dnsSearchList, dnsOptionsList)
+	_, err = resolvconf.Build(path, dnsList, dnsSearchList, dnsOptionsList)
 	if err != nil {
 		return nil, err
 	}
 
 	return mount, nil
 }
 
-func copySystemDNS(dest string) error {
-	in, err := os.Open(dresolvconf.Path())
+func copySystemDNS(filePath string) error {
+	in, err := os.Open(resolvconf.Path())
 	if err != nil {
 		return err
 	}
-	defer in.Close()
+	defer func() {
+		_ = in.Close()
+	}()
 
 	content, err := io.ReadAll(in)
 	if err != nil {
 		return err
 	}
 
-	return os.WriteFile(dest, content, 0644)
+	return os.WriteFile(filePath, content, 0644)
 }
diff --git a/drivers/shared/resolvconf/mount_unix_test.go b/drivers/shared/resolvconf/mount_unix_test.go
@@ -1,28 +1,26 @@
 //go:build !windows
-// +build !windows
 
 package resolvconf
 
 import (
-	"io/ioutil"
+	"os"
 	"path/filepath"
 	"testing"
 
-	dresolvconf "github.com/docker/libnetwork/resolvconf"
-	"github.com/stretchr/testify/require"
+	"github.com/docker/docker/libnetwork/resolvconf"
+	"github.com/shoenig/test/must"
 )
 
 func Test_copySystemDNS(t *testing.T) {
-	require := require.New(t)
-	data, err := ioutil.ReadFile(dresolvconf.Path())
-	require.NoError(err)
+	data, err := os.ReadFile(resolvconf.Path())
+	must.NoError(t, err)
 
-	dest := filepath.Join(t.TempDir(), "resolv.conf")
+	resolvConfFile := filepath.Join(t.TempDir(), "resolv.conf")
 
-	require.NoError(copySystemDNS(dest))
-	require.FileExists(dest)
+	must.NoError(t, copySystemDNS(resolvConfFile))
+	must.FileExists(t, resolvConfFile)
 
-	tmpResolv, err := ioutil.ReadFile(dest)
-	require.NoError(err)
-	require.Equal(data, tmpResolv)
+	tmpResolv, readErr := os.ReadFile(resolvConfFile)
+	must.NoError(t, readErr)
+	must.Eq(t, data, tmpResolv)
 }
diff --git a/go.mod b/go.mod
@@ -29,9 +29,8 @@ require (
 	github.com/creack/pty v1.1.18
 	github.com/docker/cli v23.0.1+incompatible
 	github.com/docker/distribution v2.8.1+incompatible
-	github.com/docker/docker v20.10.21+incompatible
+	github.com/docker/docker v23.0.3+incompatible
 	github.com/docker/go-units v0.5.0
-	github.com/docker/libnetwork v0.8.0-dev.2.0.20210525090646-64b7a4574d14
 	github.com/dustin/go-humanize v1.0.0
 	github.com/elazarl/go-bindata-assetfs v1.0.1-0.20200509193318-234c15e7648f
 	github.com/fatih/color v1.13.0 // indirect
@@ -155,7 +154,6 @@ require (
 	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Masterminds/sprig v2.22.0+incompatible // indirect
 	github.com/Masterminds/sprig/v3 v3.2.1 // indirect
-	github.com/Microsoft/hcsshim v0.9.6 // indirect
 	github.com/VividCortex/ewma v1.1.1 // indirect
 	github.com/agext/levenshtein v1.2.1 // indirect
 	github.com/apparentlymart/go-cidr v1.0.1 // indirect
@@ -174,7 +172,6 @@ require (
 	github.com/cilium/ebpf v0.9.1 // indirect
 	github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible // indirect
 	github.com/circonus-labs/circonusllhist v0.1.3 // indirect
-	github.com/containerd/cgroups v1.0.4 // indirect
 	github.com/containerd/console v1.0.3 // indirect
 	github.com/containerd/containerd v1.6.18 // indirect
 	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
@@ -228,6 +225,8 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/go-wordwrap v1.0.1 // indirect
 	github.com/mitchellh/pointerstructure v1.2.1 // indirect
+	github.com/moby/patternmatcher v0.5.0 // indirect
+	github.com/moby/sys/sequential v0.5.0 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/mrunalp/fileutils v0.5.0 // indirect
 	github.com/muesli/reflow v0.3.0
@@ -266,12 +265,12 @@ require (
 	github.com/yusufpapurcu/wmi v1.2.2 // indirect
 	go.opencensus.io v0.24.0 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
-	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/mod v0.7.0 // indirect
 	golang.org/x/net v0.5.0 // indirect
 	golang.org/x/oauth2 v0.4.0 // indirect
 	golang.org/x/term v0.4.0 // indirect
 	golang.org/x/text v0.6.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/tools v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
 	google.golang.org/api v0.103.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
@@ -283,3 +282,5 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 
 )
+
+require github.com/hashicorp/go-msgpack/v2 v2.1.0