From 13afcfe3ed27c3e344b82c1c85eed647f698d2e3 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Tue, 16 Dec 2014 22:35:07 -0500 Subject: [PATCH 1/2] add standard upgrade procedure; spelling Signed-off-by: Evan Hazlett --- drivers/amazonec2/amazonec2.go | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go index 984d8357cd..c3381337ee 100644 --- a/drivers/amazonec2/amazonec2.go +++ b/drivers/amazonec2/amazonec2.go @@ -320,7 +320,7 @@ func (d *Driver) Stop() error { func (d *Driver) Remove() error { if err := d.terminate(); err != nil { - return fmt.Errorf("unabme to terminate instance: %s", err) + return fmt.Errorf("unable to terminate instance: %s", err) } // wait until terminated so we can remove security group for { @@ -361,7 +361,17 @@ func (d *Driver) Kill() error { } func (d *Driver) Upgrade() error { - return fmt.Errorf("unable to upgrade as we are using the custom docker binary with identity auth") + sshCmd, err := d.GetSSHCommand("apt-get update && apt-get install -y lxc-docker") + if err != nil { + return err + } + sshCmd.Stdin = os.Stdin + sshCmd.Stdout = os.Stdout + sshCmd.Stderr = os.Stderr + if err := sshCmd.Run(); err != nil { + return fmt.Errorf("%s", err) + } + return nil } func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) { From bce80946d1703ef6e8c1ef82779b3265121f1741 Mon Sep 17 00:00:00 2001 From: Evan Hazlett Date: Wed, 17 Dec 2014 13:43:31 -0500 Subject: [PATCH 2/2] just return sshCmd.Run Signed-off-by: Evan Hazlett --- drivers/amazonec2/amazonec2.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/amazonec2/amazonec2.go b/drivers/amazonec2/amazonec2.go index c3381337ee..dc8e099008 100644 --- a/drivers/amazonec2/amazonec2.go +++ b/drivers/amazonec2/amazonec2.go @@ -368,10 +368,7 @@ func (d *Driver) Upgrade() error { sshCmd.Stdin = os.Stdin sshCmd.Stdout = os.Stdout sshCmd.Stderr = os.Stderr - if err := sshCmd.Run(); err != nil { - return fmt.Errorf("%s", err) - } - return nil + return sshCmd.Run() } func (d *Driver) GetSSHCommand(args ...string) (*exec.Cmd, error) {