Merge pull request docker-archive-public#4185 from SvenDowideit/rancheros-skip-default-docker-install-script

shin- · web-flow · commit 5c663c79def2 · 2017-07-07T14:59:18.000-07:00
Skip the default docker provisioning script, RancherOS already has a docker installed
diff --git a/libmachine/provision/rancheros.go b/libmachine/provision/rancheros.go
@@ -118,9 +118,13 @@ 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
+	if engineOptions.InstallURL == drivers.DefaultEngineInstallURL {
+		log.Debugf("Skipping docker engine default: %s", engineOptions.InstallURL)
+	} else {
+		log.Debugf("Selecting docker engine: %s", engineOptions.InstallURL)
+		if err := selectDocker(provisioner, engineOptions.InstallURL); err != nil {
+			return err
+		}
 	}
 
 	log.Debugf("Preparing certificates")

Original file line number	Diff line number	Diff line change
`@@ -118,9 +118,13 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.Options, aut`
`118`	`118`	`}`
`119`	`119`	`}`
`120`	`120`
`121`		`- log.Debugf("Selecting docker engine: %s", engineOptions.InstallURL)`
`122`		`- if err := selectDocker(provisioner, engineOptions.InstallURL); err != nil {`
`123`		`- return err`
	`121`	`+ if engineOptions.InstallURL == drivers.DefaultEngineInstallURL {`
	`122`	`+ log.Debugf("Skipping docker engine default: %s", engineOptions.InstallURL)`
	`123`	`+ } else {`
	`124`	`+ log.Debugf("Selecting docker engine: %s", engineOptions.InstallURL)`
	`125`	`+ if err := selectDocker(provisioner, engineOptions.InstallURL); err != nil {`
	`126`	`+ return err`
	`127`	`+ }`
`124`	`128`	`}`
`125`	`129`
`126`	`130`	`log.Debugf("Preparing certificates")`