Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,205 Commits 1 Branch 72 Tags
4a54559233db5de3ecff8416df5fab4262ea8a24
Commit Graph

1205 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
4a54559233 Merge pull request #1280 from ehazlett/native-ssh-fix 
fix issue with native ssh; fix tty allocation for redhat
 2015-06-02 16:48:02 -04:00
Evan Hazlett
c268b263a3 Merge pull request #1158 from nathanleclaire/integration_cleanup 
Refactor integration tests
 2015-06-02 14:46:44 -04:00
Nathan LeClaire
ed01843dc9 Refactor integration tests 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-02 10:10:52 -07:00
Evan Hazlett
a879b39902 Merge pull request #1268 from janeczku/waitforssh 
Check that instance has started before polling SSH
 2015-06-02 10:31:01 -04:00
Evan Hazlett
89fdcbc094 Merge pull request #1270 from ggiamarchi/doc-openstack-typo 
Fix typo in OpenStack driver documentation
 2015-06-02 10:24:52 -04:00
Evan Hazlett
5e958d0914 Merge pull request #1286 from exoscale/fix/exoscale-swarm-firewall 
exoscale: add the appropriate port to make Swarm work
 2015-06-02 09:13:27 -04:00
Vincent Bernat
a6c58534ca exoscale: add the appropriate port to make Swarm work 
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-02 11:44:18 +02:00
Evan Hazlett
e0aca821cf Merge pull request #1282 from ehazlett/engine-swarm-provision-env-vars 
enable overrides for engine and swarm install
 2015-06-01 20:32:32 -04:00
Evan Hazlett
cf0aee9fd7 support specifying swarm image and docker versions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-01 16:20:56 -04:00
Evan Hazlett
0b5a389481 fix issue with native ssh; fix tty allocation for redhat 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-01 10:08:07 -04:00
Evan Hazlett
3cd44ec4ef Merge pull request #1277 from ggiamarchi/openstack/bug#1269 
Openstack / Stop polling the instance when status is ERROR
 2015-06-01 08:40:59 -04:00
Guillaume Giamarchi
de817cfe46 Stop polling the instance when status is ERROR 
Fix #1269

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-06-01 00:49:23 +02:00
Guillaume Giamarchi
2b9dd68542 Handle possible error in WaitForSpecific func 
In some situations we need to be aware of errors
to basically return it rather than polling again
and angain until the timeout.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-06-01 00:49:16 +02:00
Evan Hazlett
eb5729d9e1 Merge pull request #1276 from hairyhenderson/amazonec2-spot-instance-monitoring-fix 
Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests
 2015-05-30 23:02:21 -04:00
Dave Henderson
904acb914a Amazon EC2 - Fixing how the Monitoring.Enabled field is set for spot requests 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-05-30 22:25:36 -04:00
Guillaume Giamarchi
f251fe9736 Fix typo in OpenStack driver documentation 
Add missing dashes before options

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-05-29 21:35:48 +02:00
Jan Broer
c7e9dc7849 libmachine: wait for instance start before polling SSH 
Signed-off-by: Jan Broer <janeczku@yahoo.de>
 2015-05-29 16:54:06 +02:00
Evan Hazlett
cef1686b33 Merge pull request #1257 from ehazlett/redhat-latest-rpm 
redhat: use engine version 1.7rc1
 2015-05-28 16:52:49 -04:00
Evan Hazlett
67bc2d685c Merge pull request #1259 from exoscale/fix/exoscale-doc 
exoscale: Two small documentation fixes
 2015-05-28 14:16:22 -04:00
Vincent Bernat
704e5fce41 exoscale/doc: specifying URL endpoint is not mandatory 
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 16:34:54 +02:00
Vincent Bernat
b414f00210 exoscale/doc: remove ability to choose a keypair 
Due to commit b772e66394, it is not
possible to use a custom keypair. Remove mention of it from the
documentation.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 16:33:30 +02:00
Evan Hazlett
139eb2824c Merge pull request #1258 from exoscale/fix/egoscale-32bit 
exoscale: update egoscale binding for 32-bit compatibility
 2015-05-28 09:30:14 -04:00
Vincent Bernat
9fb227b3b2 exoscale: update egoscale binding for 32-bit compatibility 
egoscale is updated to use int64 where it makes sense.

Closes #1212.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-28 15:02:34 +02:00
Evan Hazlett
584dec8a74 redhat: use engine version 1.7rc1 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-28 08:51:42 -04:00
Evan Hazlett
fec8b4aaab Merge pull request #1252 from janeczku/docs-fix 
docs: fix merge conflict in docs (replaces #1248)
v0.3.0-rc1 		2015-05-27 16:03:11 -04:00
Jan Broer
8cdf8e9561 Fixed corrupted docs 
Signed-off-by: Jan Broer <janeczku@yahoo.de>
 2015-05-27 21:03:59 +02:00
Evan Hazlett
be7c110dfd Merge pull request #1247 from ehazlett/redhat-tty-fix 
redhat: fix tty provision bug
 2015-05-27 13:57:44 -04:00
Evan Hazlett
ae5aeb2a67 Merge pull request #1246 from alexwlchan/master 
Fix spelling and capitalisation mistakes in docs
 2015-05-27 11:44:01 -04:00
Evan Hazlett
512f403bb2 Merge pull request #1244 from frapposelli/vcloudair-fix-catalogitem 
Fix for the default vCloud Air catalog item.
 2015-05-27 11:42:18 -04:00
Evan Hazlett
a66c229cda Merge pull request #1178 from ehazlett/debian-provisioner 
Debian Provisioner
 2015-05-27 10:59:19 -04:00
Evan Hazlett
ec5edb0354 redhat: fix tty provision bug 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-27 10:56:43 -04:00
Evan Hazlett
d99a46ca04 Merge pull request #1217 from janeczku/logger-bugfix 
logger: fix error logger writing to stdout instead of stderr
 2015-05-27 10:28:54 -04:00
alex.chan@metaswitch.com
566528547e Fix spelling and capitalisation mistakes in docs 
Signed-off-by: Alex Chan <alex.chan@metaswitch.com>
 2015-05-27 15:16:07 +01:00
Evan Hazlett
e8cdc30549 Merge pull request #1215 from janeczku/driver-exoscale 
exoscale: fix driver hanging on failed VM operation
 2015-05-27 10:04:15 -04:00
Fabio Rapposelli
850e21c3dc Fix for the default vCloud Air catalog item. 
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-05-27 15:17:26 +02:00
Evan Hazlett
5024868f17 Merge pull request #1242 from ehazlett/vbox-tty-fix 
vbox: fix provisioning hang with tty ssh
 2015-05-27 08:39:36 -04:00
Evan Hazlett
04c9e917dd vbox: fix provisioning hang with tty ssh 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-27 08:38:36 -04:00
Evan Hazlett
53d0da039a debian: rebase and fix configureSwarm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:55:38 -04:00
Evan Hazlett
3e1a6ed98c debian: rebase and streamline sudo install 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Evan Hazlett
290ead9ea0 debian: use proper location for config 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Evan Hazlett
c318008aea add debian provisioner 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Evan Hazlett
0a0bbf7dc0 Merge pull request #1138 from nathanleclaire/swarm_options 
Implement configurable Swarm options
 2015-05-26 15:33:06 -04:00
Nathan LeClaire
47bd262260 Implement configurable Swarm options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-26 10:18:34 -07:00
Evan Hazlett
7c2a4ac12c Merge pull request #1231 from frapposelli/move-vsphere-to-main-b2d 
Moved VMware vSphere driver to main b2d release tree
 2015-05-26 13:05:26 -04:00
Evan Hazlett
9bf7812473 Merge pull request #1090 from ehazlett/redhat-provisioning 
RedHat provisioning
 2015-05-26 12:52:29 -04:00
Evan Hazlett
12de02a16e merge nathanleclaire/ehazlett-redhat-provisioning 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 12:48:50 -04:00
Evan Hazlett
74de38d97f Merge pull request #1232 from frapposelli/move-fusion-to-main-b2d 
[PR for 1.7.0] Move VMware Fusion driver to the official boot2docker release.
 2015-05-26 12:26:34 -04:00
Evan Hazlett
a8e2cd7297 ssh: add -t to force tty allocation 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 12:22:28 -04:00
Evan Hazlett
0530ab3640 centos: update config path 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 12:22:28 -04:00
Evan Hazlett
97b6cd1197 centos: add provisioner 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 12:22:28 -04:00