kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8586 from afbjorklund/container-id 

Support more error messages for container inspect
pull/8795/head
Medya Ghazizadeh 2020-07-21 12:22:31 -07:00 committed by GitHub
parent e091b5d31f f23bbea995
commit f04a6a061f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/drivers/kic/oci/oci.go
View File

@ -298,7 +298,12 @@ func StartContainer(ociBin string, container string) error {
func ContainerID(ociBin string, nameOrID string) (string, error) {
rr, err := runCmd(exec.Command(ociBin, "container", "inspect", "-f", "{{.Id}}", nameOrID))
if err != nil { // don't return error if not found, only return empty string
if strings.Contains(rr.Stdout.String(), "Error: No such object:") || strings.Contains(rr.Stdout.String(), "unable to find") {
if strings.Contains(rr.Stdout.String(), "Error: No such object:") ||
strings.Contains(rr.Stdout.String(), "Error: No such container:") ||
strings.Contains(rr.Stdout.String(), "unable to find") ||
strings.Contains(rr.Stdout.String(), "Error: error inspecting object") ||
strings.Contains(rr.Stdout.String(), "Error: error looking up container") ||
strings.Contains(rr.Stdout.String(), "no such container") {
err = nil
}
return "", err