Commit Graph

680 Commits

Author SHA1 Message Date
Evan Hazlett
89ea1ed4b4 Merge pull request #795 from tianon/eval-env
Add "eval" to every invocation of "docker-machine env"
2015-03-16 22:53:21 -04:00
Evan Hazlett
cb7a488c62 Merge pull request #794 from nathanleclaire/hostname_validation_what
Add more detailed info to hostname validation error
2015-03-16 21:33:56 -04:00
Tianon Gravi
d6e3dd6b06 Add "eval" to every invocation of "docker-machine env"
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-16 18:33:24 -06:00
Nathan LeClaire
aad0c5f0a3 Add more detailed info to hostname validation error
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-16 16:48:12 -07:00
Evan Hazlett
ff3b733689 Merge pull request #782 from ehazlett/fix-default-docker-dir
fix default docker config dir
2015-03-14 16:17:20 -04:00
Evan Hazlett
9bff87f9bb fix default docker config dir
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-14 16:14:06 -04:00
Evan Hazlett
2486755347 Merge pull request #775 from nathanleclaire/wait_for_ssh
Add generic function to wait for SSH
2015-03-13 17:04:05 -04:00
Evan Hazlett
7a44b3575c Merge pull request #764 from nathanleclaire/wait_for_state
Wait for state before return on start, stop, restart, kill
2015-03-13 17:01:34 -04:00
Nathan LeClaire
f890f9b6cd Implement wait for desired state before exiting
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-13 10:26:51 -07:00
Evan Hazlett
345fa3588e Merge pull request #729 from bfirsh/more-detailed-roadmap
Add more detail to roadmap
2015-03-13 09:45:01 -04:00
Ben Firshman
e75d4d95e0 Merge pull request #778 from tristan0x/patch-1
Fix layout
2015-03-13 12:43:25 +00:00
Tristan Carel
ab6370c511 Fix layout
Fix IBM Softlayer options list on https://docs.docker.com/machine/

Signed-off-by: Tristan Carel <tristan.carel@gmail.com>
2015-03-13 13:36:08 +01:00
Nathan LeClaire
2a0e1eb79a Add generic function to wait for SSH
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-12 14:47:45 -07:00
Evan Hazlett
cf136eacd7 Merge pull request #756 from ehazlett/driver-refactor
Driver interface refactor
2015-03-12 17:37:11 -04:00
Evan Hazlett
7c5a0d5126 update tests for sethostname
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-12 13:08:52 -04:00
Evan Hazlett
4a416c6cf7 fixed b2d hostname regression
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-12 12:03:17 -04:00
Evan Hazlett
92bb9e5e20 merged origin/master
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 23:02:22 -04:00
Evan Hazlett
b2425f354d Merge pull request #768 from hairyhenderson/softlayer-apt-noninteractive-fix
Setting `DEBIAN_FRONTEND` to `noninteractive` in SoftLayer
2015-03-11 23:00:27 -04:00
Evan Hazlett
bc6b66c122 drivers: specify defaults if values are missing; i.e. config updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:59:28 -04:00
Evan Hazlett
645bf8ab90 amazonec2: add SSHUser to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-11 22:04:52 -04:00
Evan Hazlett
c6ca050653 merge 'origin/master' into driver-refactor 2015-03-11 21:45:35 -04:00
Evan Hazlett
b01cd2d9b7 Merge pull request #769 from nathanleclaire/dump_util
Add flexible JSON dump debugging method
2015-03-11 19:05:03 -04:00
Nathan LeClaire
47af93d475 Add flexible JSON dump debugging method
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-11 14:44:33 -07:00
Dave Henderson
cdf4038721 Setting DEBIAN_FRONTEND to noninteractive in SoftLayer
Fixes #763

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-11 13:19:40 -04:00
Evan Hazlett
b68f1146e2 Merge branch 'origin/master' into driver-refactor 2015-03-11 11:16:39 -04:00
Evan Hazlett
f0cbb81ee6 Merge pull request #761 from hairyhenderson/softlayer-no-hardcode-image-759
Honouring the `--softlayer-image` flag
2015-03-11 10:50:14 -04:00
Evan Hazlett
58de06d0a1 merge master
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 17:59:22 -04:00
Evan Hazlett
aae1cb35e7 Merge pull request #748 from ahmetalpbalkan/azure/syntax
drivers/azure: idiomatic syntax fixes
2015-03-10 16:20:48 -04:00
Dave Henderson
5dd5c79358 Honouring the --softlayer-image flag
Even though Machine only really supports Ubuntu, we still shouldn't
hard-code the softlayer-image to `UBUNTU_LATEST` ;)

Fixes #759

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-10 09:59:40 -04:00
Evan Hazlett
b442515491 add provider package tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:44:57 -04:00
Evan Hazlett
72f05505fa vmwarevsphere: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:41:02 -04:00
Evan Hazlett
9e27af64e3 vmwarefusion: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:27:11 -04:00
Evan Hazlett
bff7e978cf vmwarevcloudair: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:11:04 -04:00
Evan Hazlett
4b034fd1b6 softlayer: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:58:52 -04:00
Evan Hazlett
272d15343a rackspace: enable with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:39:44 -04:00
Evan Hazlett
6f098c817b openstack: driver cleanup for new interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:29:52 -04:00
Evan Hazlett
6c931dadde openstack: update for new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:27:17 -04:00
Evan Hazlett
7e362cf4a3 hyperv: updated for new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:24:11 -04:00
Evan Hazlett
ec91959979 google: updated to new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:18:18 -04:00
Evan Hazlett
d2869cbd38 Merge remote-tracking branch 'origin/master' into driver-refactor 2015-03-09 22:53:41 -04:00
Evan Hazlett
52a3019d00 azure: updated to driver interface; refactored common GetSSHCommandFromDriver for those that need it
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:53:21 -04:00
Evan Hazlett
7404e4d3ff Merge pull request #736 from shawnzhu/tlsverify-flag
uses --tlsverify instead of --tls in config output
2015-03-09 22:49:07 -04:00
Evan Hazlett
2fd1fee412 Merge pull request #720 from joninvski/patchDoc
Correct index.md documentation preamble
2015-03-09 22:48:29 -04:00
Evan Hazlett
3351f8c58d Merge pull request #726 from hairyhenderson/openstack-net-id-usage-fix
Fixing inaccurate Usage message for the `--openstack-net-id` option
2015-03-09 22:42:24 -04:00
Evan Hazlett
790d0cbf49 Merge pull request #751 from slashk/750-virtualbox-saved-paused-support
fixes Issue #750 by allowing virtualbox driver
2015-03-09 22:41:19 -04:00
Evan Hazlett
2f853ee671 Merge pull request #667 from ggiamarchi/openstack-dead-code
Openstack driver - Remove dead code
2015-03-09 22:39:09 -04:00
Evan Hazlett
51aa826e14 digitalocean: update to driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:20:47 -04:00
Evan Hazlett
6e81ba9fe7 virtualbox: finished driver updates
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 20:52:53 -04:00
Ken Pepple
bfd83eebbe fixes Issue #750 by allowing virtualbox driver
start command to start VMs in saved state and
resume VMs in paused state.

Signed-off-by: Ken Pepple <ken@solinea.com>

converted to switch statement per @nathanleclaire suggestion

Signed-off-by: Ken Pepple <ken@solinea.com>

small typo

Signed-off-by: Ken Pepple <ken@solinea.com>
2015-03-10 00:32:39 +01:00
Evan Hazlett
3787758034 Merge pull request #760 from ehazlett/softlayer-provisioning-fix
softlayer: fix provisioning bug where curl is not available
2015-03-09 18:52:58 -04:00