@@ -16,7 +16,6 @@ import (

 	"github.com/docker/docker/pkg/stringid"

 	"github.com/docker/docker/pkg/symlink"

 	"github.com/docker/docker/pkg/system"

-	"github.com/docker/docker/utils"

 	"github.com/docker/docker/volume"

 	"github.com/opencontainers/runc/libcontainer/label"

 	"golang.org/x/sys/unix"

@@ -69,7 +68,7 @@ func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string

 	// because the env on the container can override certain default values

 	// we need to replace the 'env' keys where they match and append anything

 	// else.

-	env = utils.ReplaceOrAppendEnvValues(env, container.Config.Env)

+	env = ReplaceOrAppendEnvValues(env, container.Config.Env)

 	return env

 }

@@ -8,7 +8,6 @@ import (

 	"path/filepath"

 	containertypes "github.com/docker/docker/api/types/container"

-	"github.com/docker/docker/utils"

 )

 // Container holds fields specific to the Windows implementation. See

@@ -30,7 +29,7 @@ func (container *Container) CreateDaemonEnvironment(_ bool, linkedEnv []string)

 	// because the env on the container can override certain default values

 	// we need to replace the 'env' keys where they match and append anything

 	// else.

-	return utils.ReplaceOrAppendEnvValues(linkedEnv, container.Config.Env)

+	return ReplaceOrAppendEnvValues(linkedEnv, container.Config.Env)

 }

 // UnmountIpcMounts unmounts Ipc related mounts.

new file mode 100644

@@ -0,0 +1,43 @@

+package container

+

+import (

+	"strings"

+)

+

+// ReplaceOrAppendEnvValues returns the defaults with the overrides either

+// replaced by env key or appended to the list

+func ReplaceOrAppendEnvValues(defaults, overrides []string) []string {

+	cache := make(map[string]int, len(defaults))

+	for i, e := range defaults {

+		parts := strings.SplitN(e, "=", 2)

+		cache[parts[0]] = i

+	}

+

+	for _, value := range overrides {

+		// Values w/o = means they want this env to be removed/unset.

+		if !strings.Contains(value, "=") {

+			if i, exists := cache[value]; exists {

+				defaults[i] = "" // Used to indicate it should be removed

+			}

+			continue

+		}

+

+		// Just do a normal set/update

+		parts := strings.SplitN(value, "=", 2)

+		if i, exists := cache[parts[0]]; exists {

+			defaults[i] = value

+		} else {

+			defaults = append(defaults, value)

+		}

+	}

+

+	// Now remove all entries that we want to "unset"

+	for i := 0; i < len(defaults); i++ {

+		if defaults[i] == "" {

+			defaults = append(defaults[:i], defaults[i+1:]...)

+			i--

+		}

+	}

+

+	return defaults

+}

new file mode 100644

@@ -0,0 +1,21 @@

+package container

+

+import "testing"

+

+func TestReplaceAndAppendEnvVars(t *testing.T) {

+	var (

+		d = []string{"HOME=/"}

+		o = []string{"HOME=/root", "TERM=xterm"}

+	)

+

+	env := ReplaceOrAppendEnvValues(d, o)

+	if len(env) != 2 {

+		t.Fatalf("expected len of 2 got %d", len(env))

+	}

+	if env[0] != "HOME=/root" {

+		t.Fatalf("expected HOME=/root got '%s'", env[0])

+	}

+	if env[1] != "TERM=xterm" {

+		t.Fatalf("expected TERM=xterm got '%s'", env[1])

+	}

+}

@@ -18,7 +18,6 @@ import (

 	"github.com/docker/docker/pkg/pools"

 	"github.com/docker/docker/pkg/signal"

 	"github.com/docker/docker/pkg/term"

-	"github.com/docker/docker/utils"

 )

 // Seconds to wait after sending TERM before trying KILL

@@ -94,7 +93,7 @@ func (d *Daemon) getActiveContainer(name string) (*container.Container, error) {

 // ContainerExecCreate sets up an exec in a running container.

 func (d *Daemon) ContainerExecCreate(name string, config *types.ExecConfig) (string, error) {

-	container, err := d.getActiveContainer(name)

+	cntr, err := d.getActiveContainer(name)

 	if err != nil {

 		return "", err

 	}

@@ -115,7 +114,7 @@ func (d *Daemon) ContainerExecCreate(name string, config *types.ExecConfig) (str

 	execConfig.OpenStdin = config.AttachStdin

 	execConfig.OpenStdout = config.AttachStdout

 	execConfig.OpenStderr = config.AttachStderr

-	execConfig.ContainerID = container.ID

+	execConfig.ContainerID = cntr.ID

 	execConfig.DetachKeys = keys

 	execConfig.Entrypoint = entrypoint

 	execConfig.Args = args

@@ -123,18 +122,18 @@ func (d *Daemon) ContainerExecCreate(name string, config *types.ExecConfig) (str

 	execConfig.Privileged = config.Privileged

 	execConfig.User = config.User

-	linkedEnv, err := d.setupLinkedContainers(container)

+	linkedEnv, err := d.setupLinkedContainers(cntr)

 	if err != nil {

 		return "", err

 	}

-	execConfig.Env = utils.ReplaceOrAppendEnvValues(container.CreateDaemonEnvironment(config.Tty, linkedEnv), config.Env)

+	execConfig.Env = container.ReplaceOrAppendEnvValues(cntr.CreateDaemonEnvironment(config.Tty, linkedEnv), config.Env)

 	if len(execConfig.User) == 0 {

-		execConfig.User = container.Config.User

+		execConfig.User = cntr.Config.User

 	}

-	d.registerExecCommand(container, execConfig)

+	d.registerExecCommand(cntr, execConfig)

-	d.LogContainerEvent(container, "exec_create: "+execConfig.Entrypoint+" "+strings.Join(execConfig.Args, " "))

+	d.LogContainerEvent(cntr, "exec_create: "+execConfig.Entrypoint+" "+strings.Join(execConfig.Args, " "))

 	return execConfig.ID, nil

 }

deleted file mode 100644

@@ -1,43 +0,0 @@

-package utils

-

-import (

-	"strings"

-)

-

-// ReplaceOrAppendEnvValues returns the defaults with the overrides either

-// replaced by env key or appended to the list

-func ReplaceOrAppendEnvValues(defaults, overrides []string) []string {

-	cache := make(map[string]int, len(defaults))

-	for i, e := range defaults {

-		parts := strings.SplitN(e, "=", 2)

-		cache[parts[0]] = i

-	}

-

-	for _, value := range overrides {

-		// Values w/o = means they want this env to be removed/unset.

-		if !strings.Contains(value, "=") {

-			if i, exists := cache[value]; exists {

-				defaults[i] = "" // Used to indicate it should be removed

-			}

-			continue

-		}

-

-		// Just do a normal set/update

-		parts := strings.SplitN(value, "=", 2)

-		if i, exists := cache[parts[0]]; exists {

-			defaults[i] = value

-		} else {

-			defaults = append(defaults, value)

-		}

-	}

-

-	// Now remove all entries that we want to "unset"

-	for i := 0; i < len(defaults); i++ {

-		if defaults[i] == "" {

-			defaults = append(defaults[:i], defaults[i+1:]...)

-			i--

-		}

-	}

-

-	return defaults

-}

deleted file mode 100644

@@ -1,21 +0,0 @@

-package utils

-

-import "testing"

-

-func TestReplaceAndAppendEnvVars(t *testing.T) {

-	var (

-		d = []string{"HOME=/"}

-		o = []string{"HOME=/root", "TERM=xterm"}

-	)

-

-	env := ReplaceOrAppendEnvValues(d, o)

-	if len(env) != 2 {

-		t.Fatalf("expected len of 2 got %d", len(env))

-	}

-	if env[0] != "HOME=/root" {

-		t.Fatalf("expected HOME=/root got '%s'", env[0])

-	}

-	if env[1] != "TERM=xterm" {

-		t.Fatalf("expected TERM=xterm got '%s'", env[1])

-	}

-}