From 3f6324f0e8e1b4d117a5d22f752e1d5980eea939 Mon Sep 17 00:00:00 2001 From: Victor Vieux Date: Wed, 19 Feb 2014 01:34:37 +0000 Subject: [PATCH] fix bad rebase Docker-DCO-1.1-Signed-off-by: Victor Vieux (github: vieux) --- server.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/server.go b/server.go index 9feca36e5b..759739cdd4 100644 --- a/server.go +++ b/server.go @@ -1857,6 +1857,10 @@ func (srv *Server) DeleteImage(name string, imgs *engine.Table, first, force boo tags = append(tags, tag) } + if !first && len(tags) > 0 { + return nil + } + //Untag the current image for _, tag := range tags { tagDeleted, err := srv.runtime.repositories.Delete(repoName, tag)