dont pull/inspect containers with no images

convox · Jan 27, 2016 · 12daed4 · 12daed4
1 parent a5d6878
commit 12daed4
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/api/manifest/manifest.go b/api/manifest/manifest.go
@@ -899,38 +899,40 @@ func dockerHost() (host string) {
 func getLinkEntryEnv(linkEntry ManifestEntry) (map[string]string, error) {
 	linkEntryEnv := make(map[string]string)
 
-	pull := Execer("docker", "pull", linkEntry.Image)
-	err := pull.Run()
-	if err != nil {
-		return linkEntryEnv, fmt.Errorf("could not pull container %q: %s", linkEntry.Image, err.Error())
-	}
+	if linkEntry.Image != "" {
+		pull := Execer("docker", "pull", linkEntry.Image)
+		err := pull.Run()
+		if err != nil {
+			return linkEntryEnv, fmt.Errorf("could not pull container %q: %s", linkEntry.Image, err.Error())
+		}
 
-	cmd := Execer("docker", "inspect", linkEntry.Image)
-	output, err := cmd.CombinedOutput()
+		cmd := Execer("docker", "inspect", linkEntry.Image)
+		output, err := cmd.CombinedOutput()
 
-	if err != nil {
-		return linkEntryEnv, fmt.Errorf("could not inspect container %q: %s", linkEntry.Image, err.Error())
-	}
+		if err != nil {
+			return linkEntryEnv, fmt.Errorf("could not inspect container %q: %s", linkEntry.Image, err.Error())
+		}
 
-	var inspect []struct {
-		Config struct {
-			Env []string
+		var inspect []struct {
+			Config struct {
+				Env []string
+			}
 		}
-	}
 
-	err = json.Unmarshal(output, &inspect)
-	if err != nil {
-		return linkEntryEnv, err
-	}
+		err = json.Unmarshal(output, &inspect)
+		if err != nil {
+			return linkEntryEnv, err
+		}
 
-	if len(inspect) < 1 {
-		return linkEntryEnv, fmt.Errorf("could not inspect container %q", linkEntry.Image)
-	}
+		if len(inspect) < 1 {
+			return linkEntryEnv, fmt.Errorf("could not inspect container %q", linkEntry.Image)
+		}
 
-	for _, val := range inspect[0].Config.Env {
-		parts := strings.SplitN(val, "=", 2)
-		if len(parts) == 2 {
-			linkEntryEnv[parts[0]] = parts[1]
+		for _, val := range inspect[0].Config.Env {
+			parts := strings.SplitN(val, "=", 2)
+			if len(parts) == 2 {
+				linkEntryEnv[parts[0]] = parts[1]
+			}
 		}
 	}