github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #83548 from yutedz/docker-info-cmd

Browse Source 
Show the complete docker info command
This commit is contained in:
Kubernetes Prow Robot 2019-10-06 16:29:08 -07:00 committed by GitHub
commit cd1fbf7cd4
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/cgroupdriver.go
View File

@ -48,7 +48,7 @@ func GetCgroupDriverDocker(execer utilsexec.Interface) (string, error) {
func callDockerInfo(execer utilsexec.Interface) (string, error) { func callDockerInfo(execer utilsexec.Interface) (string, error) {
out, err := execer.Command("docker", "info", "-f", "{{.CgroupDriver}}").Output() out, err := execer.Command("docker", "info", "-f", "{{.CgroupDriver}}").Output()
if err != nil { if err != nil {
return "", errors.Wrap(err, "cannot execute 'docker info'") return "", errors.Wrap(err, "cannot execute 'docker info -f {{.CgroupDriver}}'")
} }
return string(out), nil return string(out), nil
} }