From 2b1fd26fbfade7213d4c92676eb5c6ef7353ac6d Mon Sep 17 00:00:00 2001 From: Srini Brahmaroutu Date: Wed, 25 Feb 2015 04:19:49 +0000 Subject: [PATCH] Prefix / to the container name is ignored when container is renamed Closes #10996 Signed-off-by: Srini Brahmaroutu Upstream-commit: caaae78247d9ceecba07da381401c2376b478c2b Component: engine --- components/engine/Dockerfile | 2 +- components/engine/daemon/rename.go | 2 +- components/engine/integration-cli/docker_cli_rename_test.go | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 5d6e5f23e9..84c4eabbb4 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -119,7 +119,7 @@ RUN set -x \ go build -o /go/bin/registry-v2 github.com/docker/distribution/cmd/registry # Get the "docker-py" source so we can run their integration tests -ENV DOCKER_PY_COMMIT d39da1167975aaeb6c423b99621ecda1223477b8 +ENV DOCKER_PY_COMMIT 91985b239764fe54714fa0a93d52aa362357d251 RUN git clone https://github.com/docker/docker-py.git /docker-py \ && cd /docker-py \ && git checkout -q $DOCKER_PY_COMMIT diff --git a/components/engine/daemon/rename.go b/components/engine/daemon/rename.go index 3d315252ae..1e3cd5370c 100644 --- a/components/engine/daemon/rename.go +++ b/components/engine/daemon/rename.go @@ -20,7 +20,7 @@ func (daemon *Daemon) ContainerRename(job *engine.Job) engine.Status { container.Lock() defer container.Unlock() - if _, err := daemon.reserveName(container.ID, newName); err != nil { + if newName, err = daemon.reserveName(container.ID, newName); err != nil { return job.Errorf("Error when allocating new name: %s", err) } diff --git a/components/engine/integration-cli/docker_cli_rename_test.go b/components/engine/integration-cli/docker_cli_rename_test.go index 9d56a608ce..3aaf795226 100644 --- a/components/engine/integration-cli/docker_cli_rename_test.go +++ b/components/engine/integration-cli/docker_cli_rename_test.go @@ -35,7 +35,7 @@ func TestRenameStoppedContainer(t *testing.T) { if err != nil { t.Fatal(err) } - if name != "new_name" { + if name != "/new_name" { t.Fatal("Failed to rename container ", name) } @@ -62,7 +62,7 @@ func TestRenameRunningContainer(t *testing.T) { if err != nil { t.Fatal(err) } - if name != "new_name" { + if name != "/new_name" { t.Fatal("Failed to rename container ") } @@ -88,7 +88,7 @@ func TestRenameCheckNames(t *testing.T) { if err != nil { t.Fatal(err) } - if name != "new_name" { + if name != "/new_name" { t.Fatal("Failed to rename container ") }