From aa3095ef474fb98d4fc6166f4c3d36f3bab3f0d1 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@docker.com>
Date: Mon, 27 Mar 2017 17:52:01 -0700
Subject: [PATCH] remove increment flag on imageContexts.new()

Rename the methods to match my understanding of the behaviour.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: aafd7fa96909f48e43fd1b785c3c3a1f8b656ede
Component: engine
---
 components/engine/builder/dockerfile/dispatchers.go  |  8 ++------
 components/engine/builder/dockerfile/imagecontext.go | 10 ++++++----
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/components/engine/builder/dockerfile/dispatchers.go b/components/engine/builder/dockerfile/dispatchers.go
index 2234bdb3d7..06b218f23b 100644
--- a/components/engine/builder/dockerfile/dispatchers.go
+++ b/components/engine/builder/dockerfile/dispatchers.go
@@ -189,7 +189,7 @@ func from(b *Builder, args []string, attributes map[string]bool, original string
 		return err
 	}
 	b.resetImageCache()
-	if _, err := b.imageContexts.new(ctxName, true); err != nil {
+	if _, err := b.imageContexts.add(ctxName); err != nil {
 		return err
 	}
 
@@ -846,11 +846,7 @@ func mountByRef(b *Builder, name string) (*imageMount, error) {
 	if err != nil {
 		return nil, err
 	}
-	im, err := b.imageContexts.new("", false)
-	if err != nil {
-		return nil, err
-	}
-	im.id = image.ImageID()
+	im := b.imageContexts.newImageMount(image.ImageID())
 	return im, nil
 }
 
diff --git a/components/engine/builder/dockerfile/imagecontext.go b/components/engine/builder/dockerfile/imagecontext.go
index 1b92ced179..9e35d28821 100644
--- a/components/engine/builder/dockerfile/imagecontext.go
+++ b/components/engine/builder/dockerfile/imagecontext.go
@@ -22,7 +22,11 @@ type imageContexts struct {
 	currentName string
 }
 
-func (ic *imageContexts) new(name string, increment bool) (*imageMount, error) {
+func (ic *imageContexts) newImageMount(id string) *imageMount {
+	return &imageMount{ic: ic, id: id}
+}
+
+func (ic *imageContexts) add(name string) (*imageMount, error) {
 	im := &imageMount{ic: ic}
 	if len(name) > 0 {
 		if ic.byName == nil {
@@ -33,10 +37,8 @@ func (ic *imageContexts) new(name string, increment bool) (*imageMount, error) {
 		}
 		ic.byName[name] = im
 	}
-	if increment {
-		ic.list = append(ic.list, im)
-	}
 	ic.currentName = name
+	ic.list = append(ic.list, im)
 	return im, nil
 }