From 2dff0315523a3e71882d187198c85cc42bd31cae Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Fri, 22 May 2015 13:29:24 +0500
Subject: [PATCH] preload images: service dependencies

also, log implicitly added service dependencies and remove unnecessary linking to dockerwait
---
 config/default.go   | 4 ++++
 docker/container.go | 9 +++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/config/default.go b/config/default.go
index be7ea414..baa463c4 100644
--- a/config/default.go
+++ b/config/default.go
@@ -231,6 +231,9 @@ func NewConfig() *Config {
 				Environment: project.NewMaporslice([]string{
 					"CLOUD_INIT_NETWORK=false",
 				}),
+				Links: []string{
+					"preload-system-images",
+				},
 				VolumesFrom: []string{
 					"command-volumes",
 					"system-volumes",
@@ -262,6 +265,7 @@ func NewConfig() *Config {
 				}),
 				Net: "host",
 				Links: []string{
+					"preload-user-images",
 					"cloud-init-pre",
 					"network",
 				},
diff --git a/docker/container.go b/docker/container.go
index 1813b3fd..8d95de7a 100644
--- a/docker/container.go
+++ b/docker/container.go
@@ -242,12 +242,6 @@ func (c *Container) requiresUserDocker() bool {
 		return true
 	}
 
-	for _, v := range c.ContainerCfg.Service.Volumes {
-		if strings.Index(v, "/var/run/docker.sock") != -1 {
-			return true
-		}
-	}
-
 	return false
 }
 
@@ -267,10 +261,12 @@ func (c *Container) addLink(link string) {
 func (c *Container) parseService() {
 	if c.requiresSyslog() {
 		c.addLink("syslog")
+		log.Infof("[%v]: Implicitly linked to 'syslog'", c.Name)
 	}
 
 	if c.requiresUserDocker() {
 		c.addLink("dockerwait")
+		log.Infof("[%v]: Implicitly linked to 'dockerwait'", c.Name)
 	} else if c.ContainerCfg.Service.Image != "" {
 		client, err := NewClient(c.dockerHost)
 		if err != nil {
@@ -281,6 +277,7 @@ func (c *Container) parseService() {
 		i, _ := client.InspectImage(c.ContainerCfg.Service.Image)
 		if i == nil {
 			c.addLink("network")
+			log.Infof("[%v]: Implicitly linked to 'network'", c.Name)
 		}
 	}