Move init volumes code to func

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

daemon/daemon.go

@@ -607,15 +607,18 @@ func (daemon *Daemon) Commit(container *Container, repository, tag, comment, aut
 		containerID, containerImage string
 		containerConfig             *runconfig.Config
 	)
+
 	if container != nil {
 		containerID = container.ID
 		containerImage = container.Image
 		containerConfig = container.Config
 	}
+
 	img, err := daemon.graph.Create(rwTar, containerID, containerImage, comment, author, containerConfig, config)
 	if err != nil {
 		return nil, err
 	}
+
 	// Register the image if needed
 	if repository != "" {
 		if err := daemon.repositories.Set(repository, tag, img.ID, true); err != nil {

daemon/volumes.go

@@ -162,18 +162,53 @@ func createVolumes(container *Container) error {
 		return err
 	}
 
-	volumesDriver := container.daemon.volumes.Driver()
 	// Create the requested volumes if they don't exist
 	for volPath := range container.Config.Volumes {
+		if err := initializeVolume(container, volPath, binds); err != nil {
+			return err
+		}
+	}
+	return nil
+}
+
+func createIfNotExists(path string, isDir bool) error {
+	if _, err := os.Stat(path); err != nil {
+		if os.IsNotExist(err) {
+			if isDir {
+				if err := os.MkdirAll(path, 0755); err != nil {
+					return err
+				}
+			} else {
+				if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
+					return err
+				}
+				f, err := os.OpenFile(path, os.O_CREATE, 0755)
+				if err != nil {
+					return err
+				}
+				defer f.Close()
+			}
+		}
+	}
+	return nil
+}
+
+func initializeVolume(container *Container, volPath string, binds map[string]BindMap) error {
+	volumesDriver := container.daemon.volumes.Driver()
 	volPath = filepath.Clean(volPath)
-		volIsDir := true
 	// Skip existing volumes
 	if _, exists := container.Volumes[volPath]; exists {
-			continue
+		return nil
 	}
-		var srcPath string
-		var isBindMount bool
-		srcRW := false
+
+	var (
+		srcPath     string
+		isBindMount bool
+		volIsDir    = true
+
+		srcRW = false
+	)
+
 	// If an external bind is defined for this volume, use that as a source
 	if bindMap, exists := binds[volPath]; exists {
 		isBindMount = true
@@ -271,28 +306,5 @@ func createVolumes(container *Container) error {
 			}
 		}
 	}
-	}
-	return nil
-}
-
-func createIfNotExists(path string, isDir bool) error {
-	if _, err := os.Stat(path); err != nil {
-		if os.IsNotExist(err) {
-			if isDir {
-				if err := os.MkdirAll(path, 0755); err != nil {
-					return err
-				}
-			} else {
-				if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-					return err
-				}
-				f, err := os.OpenFile(path, os.O_CREATE, 0755)
-				if err != nil {
-					return err
-				}
-				defer f.Close()
-			}
-		}
-	}
 	return nil
 }

graph/graph.go

@@ -2,12 +2,6 @@ package graph
 
 import (
 	"fmt"
-	"github.com/dotcloud/docker/archive"
-	"github.com/dotcloud/docker/daemon/graphdriver"
-	"github.com/dotcloud/docker/dockerversion"
-	"github.com/dotcloud/docker/image"
-	"github.com/dotcloud/docker/runconfig"
-	"github.com/dotcloud/docker/utils"
 	"io"
 	"io/ioutil"
 	"os"
@@ -17,6 +11,13 @@ import (
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/dotcloud/docker/archive"
+	"github.com/dotcloud/docker/daemon/graphdriver"
+	"github.com/dotcloud/docker/dockerversion"
+	"github.com/dotcloud/docker/image"
+	"github.com/dotcloud/docker/runconfig"
+	"github.com/dotcloud/docker/utils"
 )
 
 // A Graph is a store for versioned filesystem images and the relationship between them.
@@ -141,11 +142,13 @@ func (graph *Graph) Create(layerData archive.ArchiveReader, containerID, contain
 		Architecture:  runtime.GOARCH,
 		OS:            runtime.GOOS,
 	}
+
 	if containerID != "" {
 		img.Parent = containerImage
 		img.Container = containerID
 		img.ContainerConfig = *containerConfig
 	}
+
 	if err := graph.Register(nil, layerData, img); err != nil {
 		return nil, err
 	}

runconfig/merge.go

@@ -1,9 +1,10 @@
 package runconfig
 
 import (
+	"strings"
+
 	"github.com/dotcloud/docker/nat"
 	"github.com/dotcloud/docker/utils"
-	"strings"
 )
 
 func Merge(userConf, imageConf *Config) error {
@@ -82,6 +83,7 @@ func Merge(userConf, imageConf *Config) error {
 			}
 		}
 	}
+
 	if userConf.Cmd == nil || len(userConf.Cmd) == 0 {
 		userConf.Cmd = imageConf.Cmd
 	}

server/server.go

@@ -1050,8 +1050,12 @@ func (srv *Server) ContainerCommit(job *engine.Job) engine.Status {
 	if container == nil {
 		return job.Errorf("No such container: %s", name)
 	}
-	var config = container.Config
-	var newConfig runconfig.Config
+
+	var (
+		config    = container.Config
+		newConfig runconfig.Config
+	)
+
 	if err := job.GetenvJson("config", &newConfig); err != nil {
 		return job.Error(err)
 	}