1. docker
  2. Commit caaae78247d9ceecba07da381401c2376b478c2b
Browse code

Prefix / to the container name is ignored when container is renamed

Closes #10996

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>

Srini Brahmaroutu authored on 2015/02/25 13:19:49
Showing 3 changed files
Dockerfile
History View file @ caaae78
... ... 
@@ -119,7 +119,7 @@ RUN set -x \
119 119 
 		go build -o /go/bin/registry-v2 github.com/docker/distribution/cmd/registry
120 120
121 121 
 # Get the "docker-py" source so we can run their integration tests
122 
-ENV DOCKER_PY_COMMIT d39da1167975aaeb6c423b99621ecda1223477b8
122 
+ENV DOCKER_PY_COMMIT 91985b239764fe54714fa0a93d52aa362357d251
123 123 
 RUN git clone https://github.com/docker/docker-py.git /docker-py \
124 124 
 	&& cd /docker-py \
125 125 
 	&& git checkout -q $DOCKER_PY_COMMIT
daemon/rename.go
History View file @ caaae78
... ... 
@@ -20,7 +20,7 @@ func (daemon *Daemon) ContainerRename(job *engine.Job) engine.Status {
20 20
21 21 
 	container.Lock()
22 22 
 	defer container.Unlock()
23 
-	if _, err := daemon.reserveName(container.ID, newName); err != nil {
23 
+	if newName, err = daemon.reserveName(container.ID, newName); err != nil {
24 24 
 		return job.Errorf("Error when allocating new name: %s", err)
25 25 
 	}
26 26
integration-cli/docker_cli_rename_test.go
History View file @ caaae78
... ... 
@@ -35,7 +35,7 @@ func TestRenameStoppedContainer(t *testing.T) {
35 35 
 	if err != nil {
36 36 
 		t.Fatal(err)
37 37 
 	}
38 
-	if name != "new_name" {
38 
+	if name != "/new_name" {
39 39 
 		t.Fatal("Failed to rename container ", name)
40 40 
 	}
41 41
... ... 
@@ -62,7 +62,7 @@ func TestRenameRunningContainer(t *testing.T) {
62 62 
 	if err != nil {
63 63 
 		t.Fatal(err)
64 64 
 	}
65 
-	if name != "new_name" {
65 
+	if name != "/new_name" {
66 66 
 		t.Fatal("Failed to rename container ")
67 67 
 	}
68 68
... ... 
@@ -88,7 +88,7 @@ func TestRenameCheckNames(t *testing.T) {
88 88 
 	if err != nil {
89 89 
 		t.Fatal(err)
90 90 
 	}
91 
-	if name != "new_name" {
91 
+	if name != "/new_name" {
92 92 
 		t.Fatal("Failed to rename container ")
93 93 
 	}
94 94