From 4b6ff484e3757e618e9fc529e978912ecf6dc9b0 Mon Sep 17 00:00:00 2001
From: Nathan Lowe <public@nlowe.me>
Date: Wed, 31 Oct 2018 13:12:52 -0400
Subject: [PATCH] #29: Support configuring the docker client from environment
variables (#54)
---
image/image.go | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/image/image.go b/image/image.go
index dcd6210..2706692 100644
--- a/image/image.go
+++ b/image/image.go
@@ -6,13 +6,14 @@ import (
"bytes"
"encoding/json"
"fmt"
- "github.com/sirupsen/logrus"
"io"
"io/ioutil"
"os"
"path/filepath"
"strings"
+ "github.com/sirupsen/logrus"
+
"github.com/docker/docker/client"
"github.com/wagoodman/dive/filetree"
"github.com/wagoodman/dive/utils"
@@ -201,7 +202,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
// pull the image if it does not exist
ctx := context.Background()
- dockerClient, err := client.NewClientWithOpts(client.WithVersion(dockerVersion))
+ dockerClient, err := client.NewClientWithOpts(client.WithVersion(dockerVersion), client.FromEnv)
if err != nil {
fmt.Println("Could not connect to the Docker daemon:" + err.Error())
utils.Exit(1)
@@ -334,7 +335,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
func saveImage(imageID string) (string, string) {
ctx := context.Background()
- dockerClient, err := client.NewClientWithOpts(client.WithVersion(dockerVersion))
+ dockerClient, err := client.NewClientWithOpts(client.WithVersion(dockerVersion), client.FromEnv)
if err != nil {
fmt.Println("Could not connect to the Docker daemon:" + err.Error())
utils.Exit(1)