Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,256 Commits 1 Branch 72 Tags
0694c0da819ef8051fd99da8ada60180a577a44f
Commit Graph

1256 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nathan LeClaire
0694c0da81 Show requests made to AWS API in debug mode 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-17 17:29:00 -07:00
Nathan LeClaire
e3790ddfa9 Merge pull request #1369 from ehazlett/install-docs-0.3.0 
docs: update install for 0.3.0
 2015-06-16 15:08:27 -07:00
Nathan LeClaire
77fd2104f7 Merge pull request #1363 from ehazlett/vbox-fix-rm-error 
vbox: fix vbox race with unregistervm
 2015-06-16 12:13:59 -07:00
Evan Hazlett
a4e90a558c Merge pull request #1371 from nathanleclaire/github_api_rate_limit 
Add more useful error message when possibly getting rate limited by Github
 2015-06-16 14:46:14 -04:00
Evan Hazlett
3b29502a9d Merge pull request #1370 from nathanleclaire/fix_native_ssh_detection 
Fix defaulting to native SSH
 2015-06-16 14:45:52 -04:00
Nathan LeClaire
5687aeda5c Add more useful error message when possibly getting rate limited by Github 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-16 10:52:57 -07:00
Nathan LeClaire
af149d13f7 Fix defaulting to native SSH 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-16 10:51:25 -07:00
Evan Hazlett
fb35035cad docs: update install for 0.3.0 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-16 10:39:13 -04:00
Evan Hazlett
a6a6e16329 vbox: fix vbox race with unregistervm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-15 17:04:46 -04:00
moxiegirl
d3d6454b52 Merge pull request #1359 from moxiegirl/test-tooling 
Documentation tooling for 1.7 release build using Hugo. Merging with Evan's go ahead with one LGTM
 2015-06-15 13:35:14 -07:00
Evan Hazlett
4b2cd762a5 Merge pull request #1360 from ehazlett/update-rpms 
provisioning: update rpms for RC3
 2015-06-15 16:18:34 -04:00
Evan Hazlett
e37e90939b provisioning: update rpms for RC3 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-15 16:16:16 -04:00
Evan Hazlett
c109623207 Merge pull request #1349 from nathanleclaire/wonky_start_ip 
Fix error from not being able to find IP on Virtualbox start
 2015-06-15 16:12:18 -04:00
Mary Anthony
ed45ddb82f Tooling for release build 
Tweaking for tooling
Adding in the sed for markdown in Dockerfile
Should be machine not engine
Updating with correct image

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:05:57 -07:00
Nathan LeClaire
e91c28fad6 Check for IP to be assigned before returning from Start() 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-11 14:02:27 -07:00
Nathan LeClaire
6d26992101 Merge pull request #1347 from ehazlett/fix-vbox-panic 
vbox: fix panic with custom cidr
 2015-06-11 14:02:04 -07:00
Evan Hazlett
5a59fa8f12 added deprecation comment 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 16:24:49 -04:00
Evan Hazlett
f26fb12664 vbox: fix panic with custom cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-11 14:04:48 -04:00
Evan Hazlett
effa03dad4 Merge pull request #1343 from moxiegirl/1329-migrate-b2b 
Closes #1329 when merged
 2015-06-11 10:09:53 -04:00
Evan Hazlett
9840c4bfe2 Merge pull request #1320 from TrumanLing/update-doc-for-availability-zone 
Update documentation for adding parameter --openstacke-availability-zone
 2015-06-11 10:05:29 -04:00
Mary Anthony
d8d673bf24 Closes #1329 when merged 
Updating links
Updating with the comments from the team

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-10 16:09:30 -07:00
Nathan LeClaire
061f865c3e Merge pull request #1341 from ehazlett/windows-prompt-for-env 
windows: error message if using powershell/cmd and none specified
 2015-06-10 13:49:21 -07:00
Evan Hazlett
d8418d01d2 Merge pull request #1338 from amylindburg/master 
Update ROADMAP.md
 2015-06-09 13:32:19 -04:00
Evan Hazlett
823020837c Merge pull request #1119 from huslage/ca-more-capabilities 
Generate more generic certificates that can have other uses.
 2015-06-09 13:20:14 -04:00
Evan Hazlett
7bd70db83b windows: error message if using powershell/cmd and none specified 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 13:18:15 -04:00
moxiegirl
ee8ec4b7aa Merge pull request #1314 from moxiegirl/tweak-1288 
Tweaking the language to the 1288 work.  Thanks everyone.
 2015-06-09 09:53:15 -07:00
Nathan LeClaire
3387f988b8 Merge pull request #1292 from ehazlett/vbox-recreate-hostonlyif 
virtualbox: more flexibility with networking
 2015-06-09 09:35:08 -07:00
Evan Hazlett
2f4d8c4237 vbox: refactor random IP allocation to func 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett
ca5f0738e2 vbox: allow specifying host only adapter cidr 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Evan Hazlett
3304bf8923 virtualbox: check for hostonly iface and add if needed on start 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-09 11:05:29 -04:00
Amy Lindburg
43f377b0b7 Update ROADMAP.md 
Add Project Planning section to ROADMAP.md

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
 2015-06-08 14:14:13 -07:00
LingFaKe
a86a99648d Update documentation for adding parameter --openstacke-availability-zone 
Signed-off-by: Ling Fake <lingfake@huawei.com>
 2015-06-06 07:02:16 -07:00
Mary Anthony
914d1c04b0 Tweaking the language to the 1288 work 
DigitalOcean is one word
Entering comments and killing nits
Fixing the OSX wagon

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-05 18:57:31 -07:00
Nathan LeClaire
7925bf2683 Merge pull request #1316 from TrumanLing/add_support_availability_zone 
Add option parameter availability_zone for openstack
 2015-06-05 17:45:16 -07:00
LingFaKe
c1b9ef6743 Add option parameter availability_zone 
Signed-off-by: Ling FaKe <lingfake@huawei.com>
 2015-06-05 17:37:43 -07:00
Evan Hazlett
30c2086cdf Merge pull request #1304 from nathanleclaire/integration_continues 
Add some helpers and patch ups to the integration tests
 2015-06-05 11:07:44 -04:00
Evan Hazlett
f6a6a1f8c8 Merge pull request #1222 from zchee/update-amazonec2-ami 
Update AMI to release 20150603
 2015-06-05 10:30:57 -04:00
Evan Hazlett
d1d4625d99 Merge pull request #1288 from ehazlett/base-os-docs 
docs: more info about supported base operating systems
 2015-06-05 09:52:12 -04:00
Nathan LeClaire
e75b6a5e5f Add some helpers and patch ups to the integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-04 15:41:37 -07:00
Evan Hazlett
7c669e2c4c Merge pull request #1307 from ehazlett/maintainers 
add nathan to maintainers
 2015-06-04 17:44:21 -04:00
Evan Hazlett
f2e6a89970 add nathan to maintainers 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-04 17:43:48 -04:00
Koichi Shiraishi
0dc1cc0ff3 Update AMI to release 20150603 
Signed-off-by: Koichi Shiraishi <zcheeee@gmail.com>
 2015-06-05 05:33:06 +09:00
Evan Hazlett
7190a5c226 docs: add note about changing ssh user for provider image 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

docs: fixed suggestions from nathan

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-04 16:07:56 -04:00
Evan Hazlett
b7fa6456bf docs: more info about supported base operating systems; removed change log from docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-04 16:07:56 -04:00
Evan Hazlett
d8419af0b2 Merge pull request #1255 from exoscale/fix/exoscale-wait-vm 
exoscale: ensure we sleep a bit while waiting for the VM to be ready
 2015-06-04 14:56:32 -04:00
Evan Hazlett
7397d15e60 Merge pull request #1295 from exoscale/fix/bats-invoking-docker-machine 
test: don't invoke docker-machine directly
 2015-06-04 14:01:30 -04:00
Vincent Bernat
6d075aed02 test: don't invoke docker-machine directly 
Use `machine` helper for that.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-03 10:30:34 +02:00
Vincent Bernat
3c16a870ac exoscale: move job waiting into a separate function 
Waiting for a job to complete is split into a dedicated function,
outside of `waitForVM()`. Functions only waiting for the job to complete
will use this new function instead. The "job is done" testing logic is
also casted into a separate function.

The original `waitForVM()` function is now waiting for the job to
complete, then retrieve the VM. This introduces an extra API call which
could be avoided by having a `waitForJob()` return the last response but
this makes the code simpler for other users and adding a special variant
just for that seems to be overkill.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-03 09:33:17 +02:00
Vincent Bernat
2d25f56ff7 exoscale: use the new utils.WaitForSpecificOrError function to wait for job to finish 
Instead of using a custom loop, use the newly introduced
`utils.WaitForSpecificOrError` function. Beware that on success, we use
the successful response to get the VM object (outside the loop).

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-03 09:09:07 +02:00
Vincent Bernat
2a60a4ea32 exoscale: ensure we sleep a bit while waiting for the VM to be ready 
Otherwise, the timeout is reached far too soon: instead of waiting for
the VM for two minutes, we wait only for a couple of seconds.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-03 09:09:07 +02:00