support specifying swarm image and docker versions

ehazlett · ehazlett · commit cf0aee9fd7cd · 2015-06-01T16:20:56.000-04:00
Signed-off-by: Evan Hazlett &lt;ejhazlett@gmail.com&gt;
diff --git a/commands/commands.go b/commands/commands.go
@@ -166,6 +166,12 @@ var sharedCreateFlags = []cli.Flag{
 		),
 		Value: "none",
 	},
+	cli.StringFlag{
+		Name:   "engine-install-url",
+		Usage:  "Custom URL to use for engine installation",
+		Value:  "https://get.docker.com",
+		EnvVar: "MACHINE_DOCKER_INSTALL_URL",
+	},
 	cli.StringSliceFlag{
 		Name:  "engine-opt",
 		Usage: "Specify arbitrary flags to include with the created engine in the form flag=value",
@@ -194,6 +200,12 @@ var sharedCreateFlags = []cli.Flag{
 		Name:  "swarm",
 		Usage: "Configure Machine with Swarm",
 	},
+	cli.StringFlag{
+		Name:   "swarm-image",
+		Usage:  "Specify Docker image to use for Swarm",
+		Value:  "swarm:latest",
+		EnvVar: "MACHINE_SWARM_IMAGE",
+	},
 	cli.BoolFlag{
 		Name:  "swarm-master",
 		Usage: "Configure Machine to be a Swarm master",
diff --git a/commands/create.go b/commands/create.go
@@ -75,9 +75,11 @@ func cmdCreate(c *cli.Context) {
 			RegistryMirror:   c.StringSlice("engine-registry-mirror"),
 			StorageDriver:    c.String("engine-storage-driver"),
 			TlsVerify:        true,
+			InstallURL:       c.String("engine-install-url"),
 		},
 		SwarmOptions: &swarm.SwarmOptions{
 			IsSwarm:        c.Bool("swarm"),
+			Image:          c.String("swarm-image"),
 			Master:         c.Bool("swarm-master"),
 			Discovery:      c.String("swarm-discovery"),
 			Address:        c.String("swarm-addr"),
diff --git a/libmachine/engine/engine.go b/libmachine/engine/engine.go
@@ -15,4 +15,5 @@ type EngineOptions struct {
 	TlsKey           string
 	TlsVerify        bool
 	RegistryMirror   []string
+	InstallURL       string
 }
diff --git a/libmachine/provision/boot2docker.go b/libmachine/provision/boot2docker.go
@@ -188,10 +188,6 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.SwarmOpt
 		return err
 	}
 
-	if err := installDockerGeneric(provisioner); err != nil {
-		return err
-	}
-
 	ip, err := provisioner.GetDriver().GetIP()
 	if err != nil {
 		return err
diff --git a/libmachine/provision/configure_swarm.go b/libmachine/provision/configure_swarm.go
@@ -74,11 +74,11 @@ func configureSwarm(p Provisioner, swarmOptions swarm.SwarmOptions, authOptions
 		Port:          port,
 		AuthOptions:   authOptions,
 		SwarmOptions:  swarmOptions,
-		SwarmImage:    swarm.DockerImage,
+		SwarmImage:    swarmOptions.Image,
 	}
 
 	// First things first, get the swarm image.
-	if _, err := p.SSHCommand(fmt.Sprintf("sudo docker pull %s", swarm.DockerImage)); err != nil {
+	if _, err := p.SSHCommand(fmt.Sprintf("sudo docker pull %s", swarmOptions.Image)); err != nil {
 		return err
 	}
 
diff --git a/libmachine/provision/debian.go b/libmachine/provision/debian.go
@@ -128,7 +128,7 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	}
 
 	log.Debug("installing docker")
-	if err := installDockerGeneric(provisioner); err != nil {
+	if err := installDockerGeneric(provisioner, engineOptions.InstallURL); err != nil {
 		return err
 	}
 
diff --git a/libmachine/provision/ubuntu.go b/libmachine/provision/ubuntu.go
@@ -113,7 +113,7 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 		}
 	}
 
-	if err := installDockerGeneric(provisioner); err != nil {
+	if err := installDockerGeneric(provisioner, engineOptions.InstallURL); err != nil {
 		return err
 	}
 
diff --git a/libmachine/provision/utils.go b/libmachine/provision/utils.go
@@ -20,10 +20,10 @@ type DockerOptions struct {
 	EngineOptionsPath string
 }
 
-func installDockerGeneric(p Provisioner) error {
+func installDockerGeneric(p Provisioner, baseURL string) error {
 	// install docker - until cloudinit we use ubuntu everywhere so we
 	// just install it using the docker repos
-	if output, err := p.SSHCommand("if ! type docker; then curl -sSL https://get.docker.com | sh -; fi"); err != nil {
+	if output, err := p.SSHCommand(fmt.Sprintf("if ! type docker; then curl -sSL %s | sh -; fi", baseURL)); err != nil {
 		return fmt.Errorf("error installing docker: %s\n", output)
 	}
 
diff --git a/libmachine/swarm/swarm.go b/libmachine/swarm/swarm.go
@@ -1,7 +1,6 @@
 package swarm
 
 const (
-	DockerImage              = "swarm:latest"
 	DiscoveryServiceEndpoint = "https://discovery-stage.hub.docker.com/v1"
 )
 
@@ -11,6 +10,7 @@ type SwarmOptions struct {
 	Discovery      string
 	Master         bool
 	Host           string
+	Image          string
 	Strategy       string
 	Heartbeat      int
 	Overcommit     float64
diff --git a/libmachine/swarm/swarm_options.go b/libmachine/swarm/swarm_options.go

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,5 @@ type EngineOptions struct {`
`15`	`15`	`TlsKey string`
`16`	`16`	`TlsVerify bool`
`17`	`17`	`RegistryMirror []string`
	`18`	`+ InstallURL string`
`18`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,11 +74,11 @@ func configureSwarm(p Provisioner, swarmOptions swarm.SwarmOptions, authOptions`
`74`	`74`	`Port: port,`
`75`	`75`	`AuthOptions: authOptions,`
`76`	`76`	`SwarmOptions: swarmOptions,`
`77`		`- SwarmImage: swarm.DockerImage,`
	`77`	`+ SwarmImage: swarmOptions.Image,`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`// First things first, get the swarm image.`
`81`		`- if _, err := p.SSHCommand(fmt.Sprintf("sudo docker pull %s", swarm.DockerImage)); err != nil {`
	`81`	`+ if _, err := p.SSHCommand(fmt.Sprintf("sudo docker pull %s", swarmOptions.Image)); err != nil {`
`82`	`82`	`return err`
`83`	`83`	`}`
`84`	`84`
Original file line number	Diff line number	Diff line change
`@@ -128,7 +128,7 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.SwarmOptions,`
`128`	`128`	`}`
`129`	`129`
`130`	`130`	`log.Debug("installing docker")`
`131`		`- if err := installDockerGeneric(provisioner); err != nil {`
	`131`	`+ if err := installDockerGeneric(provisioner, engineOptions.InstallURL); err != nil {`
`132`	`132`	`return err`
`133`	`133`	`}`
`134`	`134`
Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.SwarmOptions,`
`113`	`113`	`}`
`114`	`114`	`}`
`115`	`115`
`116`		`- if err := installDockerGeneric(provisioner); err != nil {`
	`116`	`+ if err := installDockerGeneric(provisioner, engineOptions.InstallURL); err != nil {`
`117`	`117`	`return err`
`118`	`118`	`}`
`119`	`119`
Original file line number	Diff line number	Diff line change
`@@ -20,10 +20,10 @@ type DockerOptions struct {`
`20`	`20`	`EngineOptionsPath string`
`21`	`21`	`}`
`22`	`22`
`23`		`-func installDockerGeneric(p Provisioner) error {`
	`23`	`+func installDockerGeneric(p Provisioner, baseURL string) error {`
`24`	`24`	`// install docker - until cloudinit we use ubuntu everywhere so we`
`25`	`25`	`// just install it using the docker repos`
`26`		`- if output, err := p.SSHCommand("if ! type docker; then curl -sSL https://get.docker.com \| sh -; fi"); err != nil {`
	`26`	`+ if output, err := p.SSHCommand(fmt.Sprintf("if ! type docker; then curl -sSL %s \| sh -; fi", baseURL)); err != nil {`
`27`	`27`	`return fmt.Errorf("error installing docker: %s\n", output)`
`28`	`28`	`}`
`29`	`29`