-
Notifications
You must be signed in to change notification settings - Fork 1.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information
Showing
7 changed files
with
51 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
```release-note:improvement | ||
deps: update docker to 23.0.3 | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -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) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.