docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge master 

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett 2015-03-10 17:59:22 -04:00
parent b442515491 aae1cb35e7
commit 58de06d0a1
No known key found for this signature in database
GPG Key ID: A519480096146526
1 changed files with 50 additions and 120 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

170
drivers/azure/azure.go
View File

@ -1,6 +1,7 @@
package azure package azure
import ( import (
"errors"
"fmt" "fmt"
"net" "net"
"os" "os"
@ -175,7 +176,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
} }
if (d.SubscriptionID == "" || d.SubscriptionCert == "") && d.PublishSettingsFilePath == "" { if (d.SubscriptionID == "" || d.SubscriptionCert == "") && d.PublishSettingsFilePath == "" {
return fmt.Errorf("Please specify azure subscription params using options: --azure-subscription-id and --azure-subscription-cert or --azure-publish-settings-file") return errors.New("Please specify azure subscription params using options: --azure-subscription-id and --azure-subscription-cert or --azure-publish-settings-file")
} }
if image == "" { if image == "" {
@ -188,7 +189,7 @@ func (d *Driver) SetConfigFromFlags(flags drivers.DriverOptions) error {
d.Size = flags.String("azure-size") d.Size = flags.String("azure-size")
if strings.ToLower(username) == "docker" { if strings.ToLower(username) == "docker" {
return fmt.Errorf("'docker' is not valid user name for docker host. Please specify another user name") return errors.New("'docker' is not valid user name for docker host. Please specify another user name")
} }
d.SSHUser = username d.SSHUser = username
@ -214,7 +215,7 @@ func (d *Driver) PreCreateCheck() error {
} }
if !available { if !available {
return fmt.Errorf(response) return errors.New(response)
} }
return nil return nil
@ -237,12 +238,7 @@ func (d *Driver) Create() error {
} }
log.Debug("Adding Linux provisioning...") log.Debug("Adding Linux provisioning...")
user := d.GetSSHUsername() vmConfig, err = vmClient.AddAzureLinuxProvisioningConfig(vmConfig, d.GetSSHUsername(), d.UserPassword, d.azureCertPath(), d.SSHPort)
port, err := d.GetSSHPort()
if err != nil {
return err
}
vmConfig, err = vmClient.AddAzureLinuxProvisioningConfig(vmConfig, user, d.UserPassword, d.azureCertPath(), port)
if err != nil { if err != nil {
return err return err
} }
@ -259,12 +255,7 @@ func (d *Driver) Create() error {
log.Info("Waiting for SSH...") log.Info("Waiting for SSH...")
log.Debugf("Host: %s SSH Port: %d", d.getHostname(), d.SSHPort) log.Debugf("Host: %s SSH Port: %d", d.getHostname(), d.SSHPort)
return ssh.WaitForTCP(fmt.Sprintf("%s:%d", d.getHostname(), d.SSHPort))
if err := ssh.WaitForTCP(fmt.Sprintf("%s:%d", d.getHostname(), d.SSHPort)); err != nil {
return err
}
return nil
} }
func (d *Driver) GetURL() (string, error) { func (d *Driver) GetURL() (string, error) {
@ -277,15 +268,14 @@ func (d *Driver) GetIP() (string, error) {
} }
func (d *Driver) GetState() (state.State, error) { func (d *Driver) GetState() (state.State, error) {
err := d.setUserSubscription() if err := d.setUserSubscription(); err != nil {
if err != nil {
return state.Error, err return state.Error, err
} }
dockerVM, err := vmClient.GetVMDeployment(d.MachineName, d.MachineName) dockerVM, err := vmClient.GetVMDeployment(d.MachineName, d.MachineName)
if err != nil { if err != nil {
if strings.Contains(err.Error(), "Code: ResourceNotFound") { if strings.Contains(err.Error(), "Code: ResourceNotFound") {
return state.Error, fmt.Errorf("Azure host was not found. Please check your Azure subscription.") return state.Error, errors.New("Azure host was not found. Please check your Azure subscription.")
} }
return state.Error, err return state.Error, err
@ -305,81 +295,58 @@ func (d *Driver) GetState() (state.State, error) {
} }
func (d *Driver) Start() error { func (d *Driver) Start() error {
err := d.setUserSubscription() if err := d.setUserSubscription(); err != nil {
if err != nil {
return err return err
} }
vmState, err := d.GetState() if vmState, err := d.GetState(); err != nil {
if err != nil {
return err return err
} } else if vmState == state.Running || vmState == state.Starting {
if vmState == state.Running || vmState == state.Starting {
log.Infof("Host is already running or starting") log.Infof("Host is already running or starting")
return nil return nil
} }
log.Debugf("starting %s", d.MachineName) log.Debugf("starting %s", d.MachineName)
err = vmClient.StartRole(d.MachineName, d.MachineName, d.MachineName) if err := vmClient.StartRole(d.MachineName, d.MachineName, d.MachineName); err != nil {
if err != nil {
return err return err
} }
err = d.waitForSSH() if err := d.waitForSSH(); err != nil {
if err != nil {
return err return err
} }
err = d.waitForDocker() return d.waitForDocker()
if err != nil {
return err
}
return nil
} }
func (d *Driver) Stop() error { func (d *Driver) Stop() error {
err := d.setUserSubscription() if err := d.setUserSubscription(); err != nil {
if err != nil {
return err return err
} }
vmState, err := d.GetState()
if err != nil { if vmState, err := d.GetState(); err != nil {
return err return err
} } else if vmState == state.Stopped {
if vmState == state.Stopped {
log.Infof("Host is already stopped") log.Infof("Host is already stopped")
return nil return nil
} }
log.Debugf("stopping %s", d.MachineName) log.Debugf("stopping %s", d.MachineName)
err = vmClient.ShutdownRole(d.MachineName, d.MachineName, d.MachineName) return vmClient.ShutdownRole(d.MachineName, d.MachineName, d.MachineName)
if err != nil {
return err
}
return nil
} }
func (d *Driver) Remove() error { func (d *Driver) Remove() error {
err := d.setUserSubscription() if err := d.setUserSubscription(); err != nil {
if err != nil {
return err return err
} }
available, _, err := vmClient.CheckHostedServiceNameAvailability(d.MachineName) if available, _, err := vmClient.CheckHostedServiceNameAvailability(d.MachineName); err != nil {
if err != nil {
return err return err
} } else if available {
if available {
return nil return nil
} }
log.Debugf("removing %s", d.MachineName) log.Debugf("removing %s", d.MachineName)
err = vmClient.DeleteHostedService(d.MachineName) return vmClient.DeleteHostedService(d.MachineName)
if err != nil {
return err
}
return nil
} }
func (d *Driver) Restart() error { func (d *Driver) Restart() error {
@ -387,56 +354,38 @@ func (d *Driver) Restart() error {
if err != nil { if err != nil {
return err return err
} }
vmState, err := d.GetState() if vmState, err := d.GetState(); err != nil {
if err != nil {
return err return err
} } else if vmState == state.Stopped {
if vmState == state.Stopped { return errors.New("Host is already stopped, use start command to run it")
return fmt.Errorf("Host is already stopped, use start command to run it")
} }
log.Debugf("restarting %s", d.MachineName) log.Debugf("restarting %s", d.MachineName)
err = vmClient.RestartRole(d.MachineName, d.MachineName, d.MachineName) if err := vmClient.RestartRole(d.MachineName, d.MachineName, d.MachineName); err != nil {
if err != nil {
return err return err
} }
err = d.waitForSSH() if err := d.waitForSSH(); err != nil {
if err != nil {
return err return err
} }
err = d.waitForDocker() return d.waitForDocker()
if err != nil {
return err
}
return nil
} }
func (d *Driver) Kill() error { func (d *Driver) Kill() error {
err := d.setUserSubscription() if err := d.setUserSubscription(); err != nil {
if err != nil {
return err return err
} }
vmState, err := d.GetState()
if err != nil { if vmState, err := d.GetState(); err != nil {
return err return err
} } else if vmState == state.Stopped {
if vmState == state.Stopped {
log.Infof("Host is already stopped") log.Infof("Host is already stopped")
return nil return nil
} }
log.Debugf("killing %s", d.MachineName) log.Debugf("killing %s", d.MachineName)
err = vmClient.ShutdownRole(d.MachineName, d.MachineName, d.MachineName) return vmClient.ShutdownRole(d.MachineName, d.MachineName, d.MachineName)
if err != nil {
return err
}
return nil
}
func (d *Driver) GetDockerConfigDir() string {
return dockerConfigDir
} }
func generateVMName() string { func generateVMName() string {
@ -445,34 +394,26 @@ func generateVMName() string {
} }
func (d *Driver) setUserSubscription() error { func (d *Driver) setUserSubscription() error {
if len(d.PublishSettingsFilePath) != 0 { if d.PublishSettingsFilePath != "" {
err := azure.ImportPublishSettingsFile(d.PublishSettingsFilePath) return azure.ImportPublishSettingsFile(d.PublishSettingsFilePath)
if err != nil {
return err
}
return nil
} }
err := azure.ImportPublishSettings(d.SubscriptionID, d.SubscriptionCert) return azure.ImportPublishSettings(d.SubscriptionID, d.SubscriptionCert)
if err != nil {
return err
}
return nil
} }
func (d *Driver) addDockerEndpoint(vmConfig *vmClient.Role) error { func (d *Driver) addDockerEndpoint(vmConfig *vmClient.Role) error {
configSets := vmConfig.ConfigurationSets.ConfigurationSet configSets := vmConfig.ConfigurationSets.ConfigurationSet
if len(configSets) == 0 { if len(configSets) == 0 {
return fmt.Errorf("no configuration set") return errors.New("no configuration set")
} }
for i := 0; i < len(configSets); i++ { for i := 0; i < len(configSets); i++ {
if configSets[i].ConfigurationSetType != "NetworkConfiguration" { if configSets[i].ConfigurationSetType != "NetworkConfiguration" {
continue continue
} }
ep := vmClient.InputEndpoint{} ep := vmClient.InputEndpoint{
ep.Name = "docker" Name: "docker",
ep.Protocol = "tcp" Protocol: "tcp",
ep.Port = d.DockerPort Port: d.DockerPort,
ep.LocalPort = d.DockerPort LocalPort: d.DockerPort}
configSets[i].InputEndpoints.InputEndpoint = append(configSets[i].InputEndpoints.InputEndpoint, ep) configSets[i].InputEndpoints.InputEndpoint = append(configSets[i].InputEndpoints.InputEndpoint, ep)
log.Debugf("added Docker endpoint (port %d) to configuration", d.DockerPort) log.Debugf("added Docker endpoint (port %d) to configuration", d.DockerPort)
} }
@ -481,12 +422,7 @@ func (d *Driver) addDockerEndpoint(vmConfig *vmClient.Role) error {
func (d *Driver) waitForSSH() error { func (d *Driver) waitForSSH() error {
log.Infof("Waiting for SSH...") log.Infof("Waiting for SSH...")
err := ssh.WaitForTCP(fmt.Sprintf("%s:%v", d.getHostname(), d.SSHPort)) return ssh.WaitForTCP(fmt.Sprintf("%s:%v", d.getHostname(), d.SSHPort))
if err != nil {
return err
}
return nil
} }
func (d *Driver) waitForDocker() error { func (d *Driver) waitForDocker() error {
@ -495,7 +431,7 @@ func (d *Driver) waitForDocker() error {
url := fmt.Sprintf("%s:%v", d.getHostname(), d.DockerPort) url := fmt.Sprintf("%s:%v", d.getHostname(), d.DockerPort)
success := waitForDockerEndpoint(url, maxRepeats) success := waitForDockerEndpoint(url, maxRepeats)
if !success { if !success {
return fmt.Errorf("Can not run docker daemon on remote machine. Please try again.") return errors.New("Can not run docker daemon on remote machine. Please try again.")
} }
return nil return nil
} }
@ -519,22 +455,16 @@ func waitForDockerEndpoint(url string, maxRepeats int) bool {
} }
func (d *Driver) generateCertForAzure() error { func (d *Driver) generateCertForAzure() error {
keyPath := d.GetSSHKeyPath() if err := ssh.GenerateSSHKey(d.sshKeyPath()); err != nil {
if err := ssh.GenerateSSHKey(keyPath); err != nil {
return err return err
} }
cmd := exec.Command("openssl", "req", "-x509", "-key", keyPath, "-nodes", "-days", "365", "-newkey", "rsa:2048", "-out", d.azureCertPath(), "-subj", "/C=AU/ST=Some-State/O=InternetWidgitsPtyLtd/CN=\\*") cmd := exec.Command("openssl", "req", "-x509", "-key", d.sshKeyPath(), "-nodes", "-days", "365", "-newkey", "rsa:2048", "-out", d.azureCertPath(), "-subj", "/C=AU/ST=Some-State/O=InternetWidgitsPtyLtd/CN=\\*")
if err := cmd.Run(); err != nil { return cmd.Run()
return err
}
return nil
} }
func (d *Driver) publicSSHKeyPath() string { func (d *Driver) sshKeyPath() string {
return d.GetSSHKeyPath() + ".pub" return filepath.Join(d.storePath, "id_rsa")
} }
func (d *Driver) azureCertPath() string { func (d *Driver) azureCertPath() string {