Merge pull request #52 from r2d4/dont-shell-to-docker

Always use docker client

Author: aaron-prindle

Godeps/Godeps.json

@@ -85,8 +85,6 @@ To get a JSON version of the container-diff output add a `-j` or `--json` flag.
 
 ```container-diff <img1> <img2> -j```
 
-To use the docker client instead of shelling out to your local docker daemon, add a `-e` or `--eng` flag.
-
 ```container-diff <img1> <img2> -e```
 
 To order files and packages by size (in descending order) when performing file system or package analyses/diffs, add a `-o` or `--order` flag.

README.md

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"os"
 
 	"github.com/GoogleCloudPlatform/container-diff/differs"
@@ -19,9 +20,6 @@ var analyzeCmd = &cobra.Command{
 			glog.Error(err.Error())
 			os.Exit(1)
 		}
-
-		utils.SetDockerEngine(eng)
-
 		analyzeArgs := []string{}
 		allAnalyzers := getAllAnalyzers()
 		for _, name := range allAnalyzers {
@@ -52,7 +50,17 @@ func checkAnalyzeArgNum(args []string) (bool, error) {
 }
 
 func analyzeImage(imageArg string, analyzerArgs []string) error {
-	image, err := utils.ImagePrepper{imageArg}.GetImage()
+	cli, err := NewClient()
+	if err != nil {
+		return fmt.Errorf("Error getting docker client for differ: %s", err)
+	}
+	defer cli.Close()
+	ip := utils.ImagePrepper{
+		Source: imageArg,
+		Client: cli,
+	}
+
+	image, err := ip.GetImage()
 	if err != nil {
 		glog.Error(err.Error())
 		cleanupImage(image)

cmd/analyze.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"sync"
 
@@ -20,9 +21,6 @@ var diffCmd = &cobra.Command{
 			glog.Error(err.Error())
 			os.Exit(1)
 		}
-
-		utils.SetDockerEngine(eng)
-
 		analyzeArgs := []string{}
 		allAnalyzers := getAllAnalyzers()
 		for _, name := range allAnalyzers {
@@ -53,24 +51,36 @@ func checkDiffArgNum(args []string) (bool, error) {
 }
 
 func diffImages(image1Arg, image2Arg string, diffArgs []string) error {
+	cli, err := NewClient()
+	if err != nil {
+		return fmt.Errorf("Error getting docker client for differ: %s", err)
+	}
+	defer cli.Close()
 	var wg sync.WaitGroup
 	wg.Add(2)
 
 	glog.Infof("Starting diff on images %s and %s, using differs: %s", image1Arg, image2Arg, diffArgs)
 
 	var image1, image2 utils.Image
-	var err error
 	go func() {
 		defer wg.Done()
-		image1, err = utils.ImagePrepper{image1Arg}.GetImage()
+		ip := utils.ImagePrepper{
+			Source: image1Arg,
+			Client: cli,
+		}
+		image1, err = ip.GetImage()
 		if err != nil {
 			glog.Error(err.Error())
 		}
 	}()
 
 	go func() {
 		defer wg.Done()
-		image2, err = utils.ImagePrepper{image2Arg}.GetImage()
+		ip := utils.ImagePrepper{
+			Source: image2Arg,
+			Client: cli,
+		}
+		image2, err = ip.GetImage()
 		if err != nil {
 			glog.Error(err.Error())
 		}