From 96a8cfc20a5c6b14b79b1c8044e6e3c8043b41c5 Mon Sep 17 00:00:00 2001
From: Qiang Huang <h.huangqiang@huawei.com>
Date: Fri, 1 May 2015 22:26:40 +0800
Subject: [PATCH] fix docker rm name issue

Addresses https://github.com/docker/docker/issues/12308

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 79f13d1497b073113f713e903e934dafcf78c42f
Component: engine
---
 components/engine/api/client/rm.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/components/engine/api/client/rm.go b/components/engine/api/client/rm.go
index 1ecc0d6572..d99f32e2fd 100644
--- a/components/engine/api/client/rm.go
+++ b/components/engine/api/client/rm.go
@@ -3,6 +3,7 @@ package client
 import (
 	"fmt"
 	"net/url"
+	"strings"
 
 	flag "github.com/docker/docker/pkg/mflag"
 )
@@ -36,6 +37,7 @@ func (cli *DockerCli) CmdRm(args ...string) error {
 		if name == "" {
 			return fmt.Errorf("Container name cannot be empty")
 		}
+		name = strings.Trim(name, "/")
 
 		_, _, err := readBody(cli.call("DELETE", "/containers/"+name+"?"+val.Encode(), nil, nil))
 		if err != nil {