Commit Graph

1009 Commits

Author SHA1 Message Date
Evan Hazlett
798a7a8fe9 Merge pull request #960 from crunchywelch/master
for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts
2015-04-30 11:33:22 -04:00
Evan Hazlett
6fe4331fdd vbox: stop before rm for stability
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:59 -04:00
Evan Hazlett
49686b9a91 better hint for windows shells
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-30 10:36:38 -04:00
Evan Hazlett
b99e32e819 Merge pull request #1065 from hairyhenderson/reformat-usage-1014
Reformatting usage message to look more like docker's
2015-04-30 09:27:13 -04:00
Nathan LeClaire
2574c8ba5d Implement configurable engine options
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-04-29 17:58:14 -07:00
Evan Hazlett
03c1fbadc5 Merge pull request #1073 from ehazlett/vbox-use-single-core
vbox: use single cpu by default
2015-04-29 14:07:17 -04:00
Evan Hazlett
aa5cda2e0b Merge pull request #1072 from ehazlett/gce-fix-instance-refresh
gce: fix for instance not being refreshed on create
2015-04-29 14:06:41 -04:00
Evan Hazlett
f96e93dd00 Merge pull request #1075 from ehazlett/vbox-dns-pass-through
vbox: use dns pass through
2015-04-29 14:05:37 -04:00
Evan Hazlett
9e1185e06e vbox: use dns pass through
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 12:33:10 -04:00
Evan Hazlett
31b1eb0875 gce: fix for instance not being refreshed on create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:54:08 -04:00
Evan Hazlett
e8704b14f1 vbox: use single cpu by default
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:45:33 -04:00
Evan Hazlett
9aa861ea55 update usage hint for powershell
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
92f6b45de2 env-shell: fixed tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
6b735677a0 do not hard code machine binary name in env command
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
33d8058d38 shell selection: fix tests and add powershell test
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
e13e2b61c6 use template for shell config; more powershell and cmd fixes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
7585680668 add export and clear env for powershell
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:35 -04:00
Evan Hazlett
cba15e843f powershell support
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-29 09:28:34 -04:00
Evan Hazlett
56ec00b3d2 Merge pull request #1048 from nathanleclaire/fix_windows_binary
Fix Windows binary path being broken and add -L to remaining commands
2015-04-29 09:26:37 -04:00
Evan Hazlett
4358113b41 Merge pull request #1025 from jfieber/vboxnat
Virtualbox: move NAT port allocation to machine boot
2015-04-29 09:25:38 -04:00
Evan Hazlett
193357a1ba Merge pull request #1067 from zchee/update-gce-image
Update GCE imageName to v20150316
2015-04-29 09:21:27 -04:00
Evan Hazlett
13e1b1e867 Merge pull request #1058 from hairyhenderson/rm-report-success-on-multi-machines-1053
Reporting success of each machine when removing multiples
2015-04-29 09:21:06 -04:00
zhee
5fe9adf881 Update GCE imageName to v20150316
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
2015-04-29 05:34:15 +09:00
Dave Henderson
6418fbb3d4 Reformatting command-specific usage message
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-28 14:11:01 -04:00
Dave Henderson
d9ae6dd871 Reformatting usage message to look more like docker's
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-28 12:31:39 -04:00
John Fieber
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
Evan Hazlett
c247c7ee9b Merge pull request #1059 from hairyhenderson/commands-usage-alphabetize-1014
Sorting commands in alphabetical order
2015-04-27 14:27:12 -07:00
Evan Hazlett
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
Nathan LeClaire
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
John Fieber
cafad9bb1d Merge remote-tracking branch 'origin/master' into vboxnat
# Conflicts:
#	drivers/virtualbox/virtualbox.go
2015-04-27 10:01:43 -07:00
Aaron Welch
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
Dave Henderson
5b6cbe226d Sorting commands in alphabetical order
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-04-26 14:26:18 -04:00
Dave Henderson
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
zhee
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
Evan Hazlett
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
Sascha Hanse
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
Evan Hazlett
fcd930ea8f Merge pull request #1051 from ehazlett/b2d-migration-docs
Boot2Docker migration docs
2015-04-24 10:34:48 -07:00
Evan Hazlett
57c70ef0f1 Merge pull request #956 from knarz/golint_vmware
clean up the vmware drivers
2015-04-24 09:38:09 -07:00
Evan Hazlett
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
Evan Hazlett
8b2047b47a rename doc file
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 15:18:55 -04:00
Evan Hazlett
c00a515f4c update docs for b2d migration
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 15:14:08 -04:00
Evan Hazlett
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
Sascha Hanse
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
Evan Hazlett
d881aa8038 b2d import: add migration docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
Evan Hazlett
e9491d22dc b2d import: move debug logging to debug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:03 -04:00
Evan Hazlett
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
Evan Hazlett
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
Evan Hazlett
a01322fa77 fixed ssh generation issue
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
Evan Hazlett
7a4e16e082 virtualbox: add ability to import b2d instances
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00
Evan Hazlett
576951e03a wip: b2d import
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-04-23 09:38:02 -04:00