f42177983f
Remove stray sleep()
...
This is just a bit of development debris.
Signed-off-by: John Fieber <jrf@ursamaris.org>
2015-04-27 16:58:57 -07:00
c247c7ee9b
Merge pull request #1059 from hairyhenderson/commands-usage-alphabetize-1014
...
Sorting commands in alphabetical order
2015-04-27 14:27:12 -07:00
1668f97ba4
Merge pull request #687 from zchee/google-disk-type
...
Support --google-disk-type flag for google driver
2015-04-27 14:18:06 -07:00
83d48049ac
Fix Windows binary path being broken and add -L to remaining commands
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-27 12:06:24 -07:00
cafad9bb1d
Merge remote-tracking branch 'origin/master' into vboxnat
...
# Conflicts:
# drivers/virtualbox/virtualbox.go
2015-04-27 10:01:43 -07:00
2a44f40f6c
for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts
...
Signed-off-by: Aaron Welch <welch@packet.net>
2015-04-26 15:39:22 -04:00
5b6cbe226d
Sorting commands in alphabetical order
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-26 14:26:18 -04:00
e55d9cb072
Reporting success of each machine when removing multiples
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-26 13:23:10 -04:00
7443980c26
Support "--google-disk-type" flag for google driver
...
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-26 04:38:18 +09:00
30ae863a4b
Merge pull request #1056 from knarz/unbreak-darwin
...
unbreak the darwin build, last rebase added some old variable names again
2015-04-24 16:52:20 -07:00
567e19b8ad
unbreak the darwin build, last rebase added some old variable names again
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-24 21:17:41 +02:00
fcd930ea8f
Merge pull request #1051 from ehazlett/b2d-migration-docs
...
Boot2Docker migration docs
2015-04-24 10:34:48 -07:00
57c70ef0f1
Merge pull request #956 from knarz/golint_vmware
...
clean up the vmware drivers
2015-04-24 09:38:09 -07:00
489dfb304f
Merge pull request #1044 from hairyhenderson/ip-chained-args-999
...
Enhancing `docker-machine ip` to support multiple host arguments
2015-04-23 15:03:24 -07:00
8b2047b47a
rename doc file
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 15:18:55 -04:00
c00a515f4c
update docs for b2d migration
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 15:14:08 -04:00
3f4ce28e15
Merge pull request #979 from ehazlett/b2d-import-disk
...
VirtualBox: enable ability to import b2d instances
2015-04-23 12:09:04 -07:00
6e0aecb2ee
clean up the vmware drivers
...
Signed-off-by: Sascha Hanse <shanse@gmail.com>
forgot gofmt
Signed-off-by: Sascha Hanse <shanse@gmail.com>
2015-04-23 20:12:07 +02:00
d881aa8038
b2d import: add migration docs
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
e9491d22dc
b2d import: move debug logging to debug
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
8f66be1bc2
b2d import: split key/val assignment from switch
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
33eab99e58
import cpu and memory settings when importing b2d vm
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
a01322fa77
fixed ssh generation issue
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
7a4e16e082
virtualbox: add ability to import b2d instances
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
576951e03a
wip: b2d import
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
a0f079a627
Enhancing `docker-machine ip` to support multiple host arguments
...
Fixes #999
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-22 22:10:45 -04:00
5fc9b78b38
Merge pull request #1046 from sthulb/ssh-fix
...
Fix for SSH command
2015-04-22 05:40:18 -07:00
088aeb0b52
Merge pull request #978 from ehazlett/driver-contribution-guidelines
...
driver contribution guidelines
2015-04-22 04:48:01 -07:00
f1d70a8027
Fix for SSH command
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-22 11:42:48 +01:00
55a4a7c2f2
Merge pull request #921 from hairyhenderson/inspect-format-template
...
Adding --format/-f option to inspect subcommand
2015-04-21 08:00:54 -07:00
51044b3c3f
Merge pull request #909 from sthulb/ssh-client
...
SSH Client
2015-04-21 07:58:39 -07:00
709b0a84e3
Add SSH client
...
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-04-21 15:37:09 +01:00
191564564e
Merge pull request #995 from exoscale/fix/dont-wait-in-drivers
...
Don't let drivers wait for SSH/Docker/State
2015-04-21 07:31:12 -07:00
f64eb09d1c
Merge pull request #1034 from frapposelli/fusion-shared-folders
...
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
2015-04-21 07:22:15 -07:00
57427110a4
Merge pull request #1037 from RickWieman/1032-change-logs-for-unsupported-upgrade
...
Moves the 'stopping machine' log below error log
2015-04-21 05:34:47 -07:00
2b269c0b66
Moves the 'stopping machine' log below error log
...
Fixes #1032 .
Signed-off-by: Rick Wieman <git@rickw.nl>
2015-04-21 14:18:46 +02:00
9c71e647ed
drivers/softlayer: don't let the driver wait for SSH
...
Installation of curl is handled directly by libmachine provisioning, so
there is no need to do it and hence wait for SSH to be ready.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
fbb8898914
drivers/google: don't wait for SSH to be ready
...
Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
3440ba64fa
drivers/vcloudair: don't test connectivity
...
VMWare VCloudAir driver is the only one taking an extra step to test
connectivity after machine creation. If this is a desirable step, it
should be done for all drivers in libmachine directly.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
6f1155c2e7
drivers/openstack: don't let the driver wait for state
...
OpenStack driver waits for the machine to reach the expected state. This
is already done in libmachine for most instances of this pattern.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
44be16c49f
drivers: don't let the driver wait for SSH/Docker
...
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
2015-04-21 07:11:41 +02:00
9af46e245f
Changing template function name from prettyJSON to prettyjson
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-20 19:49:47 -04:00
d40d18f9a8
Making sure all properties are available
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-20 19:27:38 -04:00
c93a17481c
Adding --format/-f option to `inspect` subcommand
...
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-20 19:27:38 -04:00
ee41dc36df
Adding github.com/stretchr/testify/assert to Godeps
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-04-20 19:27:38 -04:00
4047c97679
Merge pull request #1009 from hairyhenderson/softlayer-remove-sshkey-on-delete-765
...
Deleting Machine-generated SSH key from SoftLayer when host is canceled.
2015-04-20 14:00:24 -07:00
25583edbb3
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
...
- Update custom ISO to docker 1.6.0.
- Shared folder support for VMware Fusion.
- Updated bats test for Fusion.
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-04-20 10:34:13 -07:00
6ab04a0b51
Extract a wrench accidentally left inside the engine
...
Signed-off-by: John Fieber <jrf@ursamaris.org>
2015-04-17 12:24:58 -07:00
fdaa783597
Virtualbox: move NAT port allocation to machine boot
...
The host side ssh NAT port was being chosen by the OS
when the VM was crafted in the `Create` method.
There was no accounting for some other process taking
over the port while the VM is shutoff.
This moves the port provisioning to VM start.
On first start, the OS will supply the port. Subsequent
starts, we see if we can re-use the port, falling back
to delegating the selection to the OS.
Signed-off-by: John Fieber <jrf@ursamaris.org>
2015-04-17 11:49:18 -07:00
cade150461
Merge pull request #1013 from zekizeki/master
...
Softlayer driver, correctly store provisioned VM IP address
2015-04-17 08:49:35 -04:00
John Fieber
Evan Hazlett
Nathan LeClaire
Aaron Welch
Dave Henderson
zhee
Sascha Hanse
Simon Thulbourn
Rick Wieman
Vincent Bernat
Dave Henderson
Fabio Rapposelli