Merge pull request #3387 from jeffwubj/fix-3276

Update docker env during minikube start if VM has already been created

pkg/minikube/cluster/cluster.go

@@ -32,6 +32,7 @@ import (
 	"github.com/docker/machine/libmachine/engine"
 	"github.com/docker/machine/libmachine/host"
 	"github.com/docker/machine/libmachine/mcnerror"
+	"github.com/docker/machine/libmachine/provision"
 	"github.com/docker/machine/libmachine/ssh"
 	"github.com/docker/machine/libmachine/state"
 	"github.com/golang/glog"
@@ -97,6 +98,18 @@ func StartHost(api libmachine.API, config cfg.MachineConfig) (*host.Host, error)
 		}
 	}
 
+	e := engineOptions(config)
+	if len(e.Env) > 0 {
+		h.HostOptions.EngineOptions.Env = e.Env
+		provisioner, err := provision.DetectProvisioner(h.Driver)
+		if err != nil {
+			return nil, errors.Wrap(err, "detecting provisioner")
+		}
+		if err := provisioner.Provision(*h.HostOptions.SwarmOptions, *h.HostOptions.AuthOptions, *h.HostOptions.EngineOptions); err != nil {
+			return nil, errors.Wrap(err, "provision")
+		}
+	}
+
 	if h.Driver.DriverName() != "none" {
 		if err := h.ConfigureAuth(); err != nil {
 			return nil, &util.RetriableError{Err: errors.Wrap(err, "Error configuring auth on host")}