Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated godeps; fixed cert issue date bug

Browse Source 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
This commit is contained in:
Evan Hazlett
2015-01-14 23:56:40 -05:00
parent e2f579d376
commit fbce999d22
63 changed files with 14443 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/virtualbox/virtualbox.go
View File

@@ -137,9 +137,6 @@ func (d *Driver) Create() error {
return err
}
} else {
// HACK: Docker 1.4.1 boot2docker image with client/daemon auth
//isoURL = "https://ejhazlett.s3.amazonaws.com/public/boot2docker/machine-b2d-docker-1.4.1-identity.iso"
// todo: check latest release URL, download if it's new
// until then always use "latest"
@@ -510,7 +507,7 @@ func (d *Driver) StartDocker() error {
func (d *Driver) StopDocker() error {
log.Debug("Stopping Docker...")
cmd, err := d.GetSSHCommand("if [ -e /var/run/docker.pid ]; then kill `cat /var/run/docker.pid`; rm /var/run/docker.pid; fi")
cmd, err := d.GetSSHCommand("if [ -e /var/run/docker.pid ]; then sudo /etc/init.d/docker stop ; fi")
if err != nil {
return err
}

19
drivers/vmwarefusion/fusion.go
View File

@@ -133,8 +133,6 @@ func (d *Driver) Create() error {
if d.Boot2DockerURL != "" {
isoURL = d.Boot2DockerURL
} else {
// HACK: Docker 1.3 boot2docker image with identity auth and vmtoolsd
//isoURL = "https://github.com/cloudnativeapps/boot2docker/releases/download/1.3.1_vmw-identity/boot2docker.iso"
isoURL = "https://github.com/boot2docker/boot2docker/releases/download/v1.4.1/boot2docker.iso"
}
log.Infof("Downloading boot2docker...")
@@ -242,21 +240,6 @@ func (d *Driver) Create() error {
return err
}
//cmd, err = d.GetSSHCommand("sudo /etc/init.d/docker restart; sleep 5")
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
//cmd, err := d.GetSSHCommand("sudo /etc/init.d/docker restart; sleep 5")
//if err != nil {
// return err
//}
//if err := cmd.Run(); err != nil {
// return err
//}
return nil
}
@@ -312,7 +295,7 @@ func (d *Driver) StopDocker() error {
// TODO @ehazlett - should we add this exit to make sure it doesn't
// break if the daemon isn't running or add an arg?
cmd, err := d.GetSSHCommand("sudo /etc/init.d/docker stop ; exit 0")
cmd, err := d.GetSSHCommand("if [ -e /var/run/docker.pid ]; then sudo /etc/init.d/docker stop ; fi")
if err != nil {
return err
}