add 3rd party docker extensions

commands/commands.go

@@ -31,6 +31,7 @@ import (
 
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/auth"
+	"github.com/docker/machine/libmachine/extension"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/docker/machine/log"
 	"github.com/docker/machine/utils"
@@ -43,17 +44,18 @@ var (
 )
 
 type machineConfig struct {
-	machineName    string
-	machineDir     string
-	machineUrl     string
-	clientKeyPath  string
-	serverCertPath string
-	clientCertPath string
-	caCertPath     string
-	caKeyPath      string
-	serverKeyPath  string
-	AuthOptions    auth.AuthOptions
-	SwarmOptions   swarm.SwarmOptions
+	machineName      string
+	machineDir       string
+	machineUrl       string
+	clientKeyPath    string
+	serverCertPath   string
+	clientCertPath   string
+	caCertPath       string
+	caKeyPath        string
+	serverKeyPath    string
+	AuthOptions      auth.AuthOptions
+	SwarmOptions     swarm.SwarmOptions
+	ExtensionOptions extension.ExtensionOptions
 }
 
 func sortHostListItemsByName(items []libmachine.HostListItem) {
@@ -236,6 +238,11 @@ var sharedCreateFlags = []cli.Flag{
 		Usage: "addr to advertise for Swarm (default: detect and use the machine IP)",
 		Value: "",
 	},
+	cli.StringFlag{
+		Name:  "extension",
+		Usage: "specify local path or network resource for the YAML or JSON extension file",
+		Value: "",
+	},
 }
 
 var Commands = []cli.Command{
@@ -609,17 +616,18 @@ func getMachineConfig(c *cli.Context) (*machineConfig, error) {
 		}
 	}
 	return &machineConfig{
-		machineName:    name,
-		machineDir:     machineDir,
-		machineUrl:     machineUrl,
-		clientKeyPath:  clientKey,
-		clientCertPath: clientCert,
-		serverCertPath: serverCert,
-		caKeyPath:      caKey,
-		caCertPath:     caCert,
-		serverKeyPath:  serverKey,
-		AuthOptions:    *m.HostOptions.AuthOptions,
-		SwarmOptions:   *m.HostOptions.SwarmOptions,
+		machineName:      name,
+		machineDir:       machineDir,
+		machineUrl:       machineUrl,
+		clientKeyPath:    clientKey,
+		clientCertPath:   clientCert,
+		serverCertPath:   serverCert,
+		caKeyPath:        caKey,
+		caCertPath:       caCert,
+		serverKeyPath:    serverKey,
+		AuthOptions:      *m.HostOptions.AuthOptions,
+		SwarmOptions:     *m.HostOptions.SwarmOptions,
+		ExtensionOptions: *m.HostOptions.ExtensionOptions,
 	}, nil
 }
 

commands/config_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/engine"
+	"github.com/docker/machine/libmachine/extension"
 	"github.com/docker/machine/libmachine/swarm"
 )
 
@@ -48,7 +49,8 @@ func TestCmdConfig(t *testing.T) {
 			Address:   "",
 			Host:      "",
 		},
-		AuthOptions: &auth.AuthOptions{},
+		AuthOptions:      &auth.AuthOptions{},
+		ExtensionOptions: &extension.ExtensionOptions{},
 	}
 
 	host, err := provider.Create("test-a", "none", hostOptions, flags)

commands/create.go

@@ -12,6 +12,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/engine"
+	"github.com/docker/machine/libmachine/extension"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/docker/machine/utils"
 )
@@ -93,6 +94,9 @@ func cmdCreate(c *cli.Context) {
 			Strategy:       c.String("swarm-strategy"),
 			ArbitraryFlags: c.StringSlice("swarm-opt"),
 		},
+		ExtensionOptions: &extension.ExtensionOptions{
+			File: c.String("extension"),
+		},
 	}
 
 	_, err = provider.Create(name, driver, hostOptions, c)

commands/env_test.go

@@ -14,6 +14,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/engine"
+	"github.com/docker/machine/libmachine/extension"
 	"github.com/docker/machine/libmachine/swarm"
 )
 
@@ -56,7 +57,8 @@ func TestCmdEnvBash(t *testing.T) {
 			Address:   "",
 			Host:      "",
 		},
-		AuthOptions: &auth.AuthOptions{},
+		AuthOptions:      &auth.AuthOptions{},
+		ExtensionOptions: &extension.ExtensionOptions{},
 	}
 
 	host, err := provider.Create("test-a", "none", hostOptions, flags)
@@ -155,7 +157,8 @@ func TestCmdEnvFish(t *testing.T) {
 			Address:   "",
 			Host:      "",
 		},
-		AuthOptions: &auth.AuthOptions{},
+		AuthOptions:      &auth.AuthOptions{},
+		ExtensionOptions: &extension.ExtensionOptions{},
 	}
 
 	host, err := provider.Create("test-a", "none", hostOptions, flags)
@@ -254,7 +257,8 @@ func TestCmdEnvPowerShell(t *testing.T) {
 			Address:   "",
 			Host:      "",
 		},
-		AuthOptions: &auth.AuthOptions{},
+		AuthOptions:      &auth.AuthOptions{},
+		ExtensionOptions: &extension.ExtensionOptions{},
 	}
 
 	host, err := provider.Create("test-a", "none", hostOptions, flags)

commands/inspect_test.go

@@ -13,6 +13,7 @@ import (
 	"github.com/docker/machine/libmachine"
 	"github.com/docker/machine/libmachine/auth"
 	"github.com/docker/machine/libmachine/engine"
+	"github.com/docker/machine/libmachine/extension"
 	"github.com/docker/machine/libmachine/swarm"
 	"github.com/stretchr/testify/assert"
 )
@@ -86,7 +87,8 @@ func runInspectCommand(t *testing.T, args []string) (string, *libmachine.Host) {
 			Address:   "",
 			Host:      "",
 		},
-		AuthOptions: &auth.AuthOptions{},
+		AuthOptions:      &auth.AuthOptions{},
+		ExtensionOptions: &extension.ExtensionOptions{},
 	}
 
 	flags := getTestDriverFlags()