Always use the docker client

Author: r2d4

README.md

@@ -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.

cmd/root.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"bytes"
+	"context"
 	"errors"
 	goflag "flag"
 	"fmt"
@@ -12,13 +13,13 @@ import (
 
 	"github.com/GoogleCloudPlatform/container-diff/differs"
 	"github.com/GoogleCloudPlatform/container-diff/utils"
+	"github.com/docker/docker/client"
 	"github.com/golang/glog"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 )
 
 var json bool
-var eng bool
 var save bool
 
 var apt bool
@@ -45,8 +46,6 @@ var RootCmd = &cobra.Command{
 			os.Exit(1)
 		}
 
-		utils.SetDockerEngine(eng)
-
 		analyzeArgs := []string{}
 		allAnalyzers := getAllAnalyzers()
 		for _, name := range allAnalyzers {
@@ -76,25 +75,48 @@ var RootCmd = &cobra.Command{
 	},
 }
 
+func NewClient() (*client.Client, error) {
+	cli, err := client.NewEnvClient()
+	if err != nil {
+		return nil, fmt.Errorf("Error getting docker client: %s", err)
+	}
+	cli.NegotiateAPIVersion(context.Background())
+
+	return cli, nil
+}
+
 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())
 		}
@@ -137,7 +159,18 @@ func diffImages(image1Arg, image2Arg string, diffArgs []string) 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 analyzer: %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)
@@ -288,7 +321,6 @@ func remove(path string, dir bool) string {
 func init() {
 	pflag.CommandLine.AddGoFlagSet(goflag.CommandLine)
 	RootCmd.Flags().BoolVarP(&json, "json", "j", false, "JSON Output defines if the diff should be returned in a human readable format (false) or a JSON (true).")
-	RootCmd.Flags().BoolVarP(&eng, "eng", "e", false, "By default the docker calls are shelled out locally, set this flag to use the Docker Engine Client (version compatibility required).")
 	RootCmd.Flags().BoolVarP(&pip, "pip", "p", false, "Set this flag to use the pip differ.")
 	RootCmd.Flags().BoolVarP(&node, "node", "n", false, "Set this flag to use the node differ.")
 	RootCmd.Flags().BoolVarP(&apt, "apt", "a", false, "Set this flag to use the apt differ.")

differs/historyDiff.go

@@ -9,6 +9,11 @@ import (
 type HistoryAnalyzer struct {
 }
 
+type HistDiff struct {
+	Adds []string
+	Dels []string
+}
+
 func (a HistoryAnalyzer) Diff(image1, image2 utils.Image) (utils.Result, error) {
 	diff, err := getHistoryDiff(image1, image2)
 	return &utils.HistDiffResult{
@@ -29,13 +34,13 @@ func (a HistoryAnalyzer) Analyze(image utils.Image) (utils.Result, error) {
 	return &result, nil
 }
 
-func getHistoryDiff(image1, image2 utils.Image) (utils.HistDiff, error) {
+func getHistoryDiff(image1, image2 utils.Image) (HistDiff, error) {
 	history1 := getHistoryList(image1.Config.History)
 	history2 := getHistoryList(image2.Config.History)
 
 	adds := utils.GetAdditions(history1, history2)
 	dels := utils.GetDeletions(history1, history2)
-	diff := utils.HistDiff{adds, dels}
+	diff := HistDiff{adds, dels}
 	return diff, nil
 }