github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83556 from zouyee/kubeadminfo

Browse Source 
Complete output of docker info
This commit is contained in:
Kubernetes Prow Robot 2019-10-08 20:00:04 -07:00 committed by GitHub
commit 33809f24e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/util/system/docker_validator.go
View File

@ -74,7 +74,7 @@ func (d *DockerValidator) Validate(spec SysSpec) ([]error, []error) {
func (d *DockerValidator) unmarshalDockerInfo(b []byte, info *dockerInfo) error { func (d *DockerValidator) unmarshalDockerInfo(b []byte, info *dockerInfo) error {
if err := json.Unmarshal(b, &info); err != nil { if err := json.Unmarshal(b, &info); err != nil {
return errors.Wrap(err, "could not unmarshal the JSON output of 'docker info'") return errors.Wrapf(err, "could not unmarshal the JSON output of 'docker info':\n%s\n", b)
} }
return nil return nil
} }