Merge pull request #12969 from rhatdan/remote

Fix handling of duplicate matches on id expansion
containers · Jan 25, 2022 · 95db13d · 95db13d
2 parents 6d8507d + 80a5295
commit 95db13d
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/pkg/api/handlers/utils/errors.go b/pkg/api/handlers/utils/errors.go
@@ -40,10 +40,12 @@ func VolumeNotFound(w http.ResponseWriter, name string, err error) {
 }
 
 func ContainerNotFound(w http.ResponseWriter, name string, err error) {
-	if errors.Cause(err) != define.ErrNoSuchCtr {
+	switch errors.Cause(err) {
+	case define.ErrNoSuchCtr, define.ErrCtrExists:
+		Error(w, http.StatusNotFound, err)
+	default:
 		InternalServerError(w, err)
 	}
-	Error(w, http.StatusNotFound, err)
 }
 
 func ImageNotFound(w http.ResponseWriter, name string, err error) {