Merge pull request #2166 from kunalkushwaha/swarm-proxy

Environment variables passed to provision machine, will be passed to …

libmachine/provision/arch.go

@@ -108,6 +108,7 @@ func (provisioner *ArchProvisioner) Provision(swarmOptions swarm.SwarmOptions, a
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
 		provisioner.EngineOptions.StorageDriver = "overlay"

libmachine/provision/boot2docker.go

@@ -239,6 +239,7 @@ func (provisioner *Boot2DockerProvisioner) Provision(swarmOptions swarm.SwarmOpt
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
 		provisioner.EngineOptions.StorageDriver = "aufs"

libmachine/provision/configure_swarm.go

@@ -14,6 +14,7 @@ import (
 
 type SwarmCommandContext struct {
 	ContainerName string
+	Env           []string
 	DockerDir     string
 	DockerPort    int
 	Ip            string
@@ -70,6 +71,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.SwarmOptions, authOptions
 
 	swarmCmdContext := SwarmCommandContext{
 		ContainerName: "",
+		Env:           swarmOptions.Env,
 		DockerDir:     dockerDir,
 		DockerPort:    2376,
 		Ip:            ip,
@@ -86,6 +88,7 @@ func configureSwarm(p Provisioner, swarmOptions swarm.SwarmOptions, authOptions
 
 	swarmMasterCmdTemplate := `sudo docker run -d \
 --restart=always \
+{{range .Env}} -e {{.}}{{end}} \
 --name swarm-agent-master \
 -p {{.Port}}:{{.Port}} \
 -v {{.DockerDir}}:{{.DockerDir}} \
@@ -101,6 +104,7 @@ manage \
 
 	swarmWorkerCmdTemplate := `sudo docker run -d \
 --restart=always \
+{{range .Env}} -e {{.}}{{end}} \
 --name swarm-agent \
 {{.SwarmImage}} \
 join --advertise {{.Ip}}:{{.DockerPort}} {{.SwarmOptions.Discovery}}

libmachine/provision/debian.go

@@ -125,6 +125,7 @@ func (provisioner *DebianProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
 		provisioner.EngineOptions.StorageDriver = "aufs"

libmachine/provision/rancheros.go

@@ -91,6 +91,7 @@ func (provisioner *RancherProvisioner) Provision(swarmOptions swarm.SwarmOptions
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
 		provisioner.EngineOptions.StorageDriver = "overlay"

libmachine/provision/redhat.go

@@ -200,6 +200,7 @@ func (provisioner *RedHatProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	// set default storage driver for redhat
 	if provisioner.EngineOptions.StorageDriver == "" {

libmachine/provision/suse.go

@@ -133,6 +133,7 @@ func (provisioner *SUSEProvisioner) Provision(swarmOptions swarm.SwarmOptions, a
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if err := provisioner.SetHostname(provisioner.Driver.GetMachineName()); err != nil {
 		return err

libmachine/provision/ubuntu.go

@@ -118,6 +118,7 @@ func (provisioner *UbuntuProvisioner) Provision(swarmOptions swarm.SwarmOptions,
 	provisioner.SwarmOptions = swarmOptions
 	provisioner.AuthOptions = authOptions
 	provisioner.EngineOptions = engineOptions
+	swarmOptions.Env = engineOptions.Env
 
 	if provisioner.EngineOptions.StorageDriver == "" {
 		provisioner.EngineOptions.StorageDriver = "aufs"

libmachine/swarm/swarm.go

@@ -15,4 +15,5 @@ type SwarmOptions struct {
 	Heartbeat      int
 	Overcommit     float64
 	ArbitraryFlags []string
+	Env            []string
 }