From 14028a1cf6af3ee0ed4338aa1d85174809b837f3 Mon Sep 17 00:00:00 2001
From: Victor Marmol <vmarmol@google.com>
Date: Fri, 13 Jun 2014 18:28:40 -0700
Subject: [PATCH] Remove all of a container's aliases on destroy

---
 manager/manager.go | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/manager/manager.go b/manager/manager.go
index 93eee260..86ed2919 100644
--- a/manager/manager.go
+++ b/manager/manager.go
@@ -181,9 +181,12 @@ func (m *manager) destroyContainer(containerName string) error {
 		return err
 	}
 
-	// Remove the container from our records.
+	// Remove the container from our records (and all its aliases).
 	delete(m.containers, containerName)
-	log.Printf("Destroyed container: %s", containerName)
+	for _, alias := range cont.info.Aliases {
+		delete(m.containers, alias)
+	}
+	log.Printf("Destroyed container: %s (aliases: %s)", containerName, cont.info.Aliases)
 	return nil
 }