Merge pull request docker-archive-public#4082 from SvenDowideit/allow-rancheros-to-select-docker-version

nathanleclaire · web-flow · commit d889abc3528b · 2017-05-31T16:02:27.000-07:00
Allow rancheros (all-non-b2d) to select a different Docker engine version using --engine-install-url
diff --git a/drivers/hyperv/hyperv.go b/drivers/hyperv/hyperv.go
@@ -6,8 +6,6 @@ import (
 	"os"
 	"time"
 
-	"errors"
-
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -94,9 +92,6 @@ func (d *Driver) GetCreateFlags() []mcnflag.Flag {
 }
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
-	if drivers.EngineInstallURLFlagSet(flags) {
-		return errors.New("--engine-install-url cannot be used with the hyperv driver, use --hyperv-boot2docker-url instead")
-	}
 	d.Boot2DockerURL = flags.String("hyperv-boot2docker-url")
 	d.VSwitch = flags.String("hyperv-virtual-switch")
 	d.DiskSize = flags.Int("hyperv-disk-size")
diff --git a/drivers/virtualbox/virtualbox.go b/drivers/virtualbox/virtualbox.go
@@ -228,9 +228,6 @@ func (d *Driver) GetURL() (string, error) {
 }
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
-	if drivers.EngineInstallURLFlagSet(flags) {
-		return errors.New("--engine-install-url cannot be used with the virtualbox driver, use --virtualbox-boot2docker-url instead")
-	}
 	d.CPU = flags.Int("virtualbox-cpu-count")
 	d.Memory = flags.Int("virtualbox-memory")
 	d.DiskSize = flags.Int("virtualbox-disk-size")
diff --git a/drivers/vmwarefusion/fusion_darwin.go b/drivers/vmwarefusion/fusion_darwin.go
@@ -18,8 +18,6 @@ import (
 	"text/template"
 	"time"
 
-	"errors"
-
 	"github.com/docker/machine/libmachine/drivers"
 	"github.com/docker/machine/libmachine/log"
 	"github.com/docker/machine/libmachine/mcnflag"
@@ -145,9 +143,6 @@ func (d *Driver) DriverName() string {
 }
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
-	if drivers.EngineInstallURLFlagSet(flags) {
-		return errors.New("--engine-install-url cannot be used with the vmwarefusion driver, use --vmwarefusion-boot2docker-url instead")
-	}
 	d.Memory = flags.Int("vmwarefusion-memory-size")
 	d.CPU = flags.Int("vmwarefusion-cpu-count")
 	d.DiskSize = flags.Int("vmwarefusion-disk-size")
diff --git a/drivers/vmwarevsphere/vsphere.go b/drivers/vmwarevsphere/vsphere.go
@@ -183,9 +183,6 @@ func (d *Driver) DriverName() string {
 }
 
 func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
-	if drivers.EngineInstallURLFlagSet(flags) {
-		return errors.New("--engine-install-url cannot be used with the vmwarevsphere driver, use --vmwarevsphere-boot2docker-url instead")
-	}
 	d.SSHUser = "docker"
 	d.SSHPort = 22
 	d.CPU = flags.Int("vmwarevsphere-cpu-count")
diff --git a/libmachine/drivers/base.go b/libmachine/drivers/base.go
@@ -86,6 +86,9 @@ func (d *BaseDriver) SetSwarmConfigFromFlags(flags DriverOptions) {
 }
 
 func EngineInstallURLFlagSet(flags DriverOptions) bool {
-	engineInstallURLFlag := flags.String("engine-install-url")
-	return engineInstallURLFlag != DefaultEngineInstallURL && engineInstallURLFlag != ""
+	return EngineInstallURLSet(flags.String("engine-install-url"))
+}
+
+func EngineInstallURLSet(url string) bool {
+	return url != DefaultEngineInstallURL && url != ""
 }
diff --git a/libmachine/provision/rancheros.go b/libmachine/provision/rancheros.go
@@ -93,6 +93,8 @@ func (provisioner *RancherProvisioner) Package(name string, action pkgaction.Pac
 }
 
 func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, authOptions auth.Options, engineOptions engine.Options) error {
+	log.Debugf("Running RancherOS provisioner on %s", provisioner.Driver.GetMachineName())
+
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
@@ -116,6 +118,11 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, aut
 		}
 	}
 
+	log.Debugf("Selecting docker engine: %s", engineOptions.InstallURL)
+	if err := selectDocker(provisioner, engineOptions.InstallURL); err != nil {
+		return err
+	}
+
 	log.Debugf("Preparing certificates")
 	provisioner.AuthOptions = setRemoteAuthOptions(provisioner)
 
@@ -231,3 +238,12 @@ func (provisioner *RancherProvisioner) getLatestISOURL() (string, error) {
 
 	return "", fmt.Errorf("Failed to find current version")
 }
+
+func selectDocker(p Provisioner, baseURL string) error {
+	// TODO: detect if its a cloud-init, or a ros setting - and use that..
+	if output, err := p.SSHCommand(fmt.Sprintf("wget -O- %s | sh -", baseURL)); err != nil {
+		return fmt.Errorf("error selecting docker: (%s) %s", err, output)
+	}
+
+	return nil
+}

Original file line number	Diff line number	Diff line change
`@@ -228,9 +228,6 @@ func (d *Driver) GetURL() (string, error) {`
`228`	`228`	`}`
`229`	`229`
`230`	`230`	`func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {`
`231`		`- if drivers.EngineInstallURLFlagSet(flags) {`
`232`		`- return errors.New("--engine-install-url cannot be used with the virtualbox driver, use --virtualbox-boot2docker-url instead")`
`233`		`- }`
`234`	`231`	`d.CPU = flags.Int("virtualbox-cpu-count")`
`235`	`232`	`d.Memory = flags.Int("virtualbox-memory")`
`236`	`233`	`d.DiskSize = flags.Int("virtualbox-disk-size")`
Original file line number	Diff line number	Diff line change
`@@ -183,9 +183,6 @@ func (d *Driver) DriverName() string {`
`183`	`183`	`}`
`184`	`184`
`185`	`185`	`func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {`
`186`		`- if drivers.EngineInstallURLFlagSet(flags) {`
`187`		`- return errors.New("--engine-install-url cannot be used with the vmwarevsphere driver, use --vmwarevsphere-boot2docker-url instead")`
`188`		`- }`
`189`	`186`	`d.SSHUser = "docker"`
`190`	`187`	`d.SSHPort = 22`
`191`	`188`	`d.CPU = flags.Int("vmwarevsphere-cpu-count")`
Original file line number	Diff line number	Diff line change
`@@ -86,6 +86,9 @@ func (d *BaseDriver) SetSwarmConfigFromFlags(flags DriverOptions) {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`func EngineInstallURLFlagSet(flags DriverOptions) bool {`
`89`		`- engineInstallURLFlag := flags.String("engine-install-url")`
`90`		`- return engineInstallURLFlag != DefaultEngineInstallURL && engineInstallURLFlag != ""`
	`89`	`+ return EngineInstallURLSet(flags.String("engine-install-url"))`
	`90`	`+}`
	`91`	`+`
	`92`	`+func EngineInstallURLSet(url string) bool {`
	`93`	`+ return url != DefaultEngineInstallURL && url != ""`
`91`	`94`	`}`