diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-05-05 06:31:39 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-05 06:31:39 -0400 |
| commit | 8ed517576cc185ddfa5d2e3af9c034e9ae375841 (patch) | |
| tree | 5a8c5e0de2891aabff624492a1839f2be017c5f1 /vendor/github.com/fsouza/go-dockerclient/auth.go | |
| parent | 88f8d398b357c60f8b78b8dedf1e1515a534b873 (diff) | |
| parent | ed159f864dc8e2cd79d98fb46a28f1413dc1a7fb (diff) | |
| download | podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.tar.gz podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.tar.bz2 podman-8ed517576cc185ddfa5d2e3af9c034e9ae375841.zip | |
Merge pull request #14118 from rhatdan/VENDOR
Vendor in containers/buildah@v1.26.1
Diffstat (limited to 'vendor/github.com/fsouza/go-dockerclient/auth.go')
| -rw-r--r-- | vendor/github.com/fsouza/go-dockerclient/auth.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vendor/github.com/fsouza/go-dockerclient/auth.go b/vendor/github.com/fsouza/go-dockerclient/auth.go index bc949dc35..d867c4736 100644 --- a/vendor/github.com/fsouza/go-dockerclient/auth.go +++ b/vendor/github.com/fsouza/go-dockerclient/auth.go @@ -10,7 +10,6 @@ import ( "encoding/json" "errors" "io" - "io/ioutil" "net/http" "os" "os/exec" @@ -272,7 +271,7 @@ func (c *Client) AuthCheck(conf *AuthConfiguration) (AuthStatus, error) { return authStatus, err } defer resp.Body.Close() - data, err := ioutil.ReadAll(resp.Body) + data, err := io.ReadAll(resp.Body) if err != nil { return authStatus, err } @@ -318,7 +317,7 @@ func NewAuthConfigurationsFromCredsHelpers(registry string) (*AuthConfiguration, func getHelperProviderFromDockerCfg(pathsToTry []string, registry string) (string, error) { for _, path := range pathsToTry { - content, err := ioutil.ReadFile(path) + content, err := os.ReadFile(path) if err != nil { // if we can't read the file keep going continue |