Commit Graph

2224 Commits

Author SHA1 Message Date
David Gageot 3612c55677 Add version to machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-03 16:27:42 +01:00
Jean-Laurent de Morlhon 3f0625fbac Merge pull request #2487 from frapposelli/vsphere-path-fix
Fix for vSphere driver boot2docker ISO issues
2015-12-03 15:33:25 +01:00
Thomas Recloux 0408378332 AWS : update default images to ubuntu 15.10
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com>
2015-12-03 14:50:21 +01:00
Fabio Rapposelli 2dcfcf2b06
Fix for vSphere driver boot2docker ISO issues
Fixes #2279 #2060

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-12-03 07:24:26 -05:00
dongmx ce524e1740 Swarm container net should be host. If use bridge, sometime container ip addresses conflict.
Signed-off-by: dongmx <dongmx@xueqiu.com>
2015-12-03 19:11:34 +08:00
dongmx e799388e85 issue #2485, If a permanent IP address and hostname has alread in /etc/hosts
Signed-off-by: dongmx <dongmx@xueqiu.com>
2015-12-03 18:59:40 +08:00
David Gageot e26c485013 Vendor samalba.dockerclient
Signed-off-by: David Gageot <david@gageot.net>
2015-12-03 10:56:25 +01:00
David Gageot 029b39ee62 Merge pull request #2141 from janeczku/digitalocean-userdata
Digitalocean driver: Support for creating Droplets with Cloud-init User Data
2015-12-03 10:53:06 +01:00
David Gageot fc0c883957 Merge pull request #2482 from askb/fix_test
Now the returned `err` is being checked to ensure its `Nil`
2015-12-03 10:46:31 +01:00
Anil Belur 2d71dc77dc This is a follow up for PR #2473
Now the returned `err` is being checked to ensure its `Nil`

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-03 09:13:44 +05:30
Nathan LeClaire 98a1c8c159 Merge pull request #2473 from askb/2451_key_filter_case
Fixes #2451 - ensures ls filters `<key>` and `<value>` works case-insensitive
2015-12-02 15:42:12 -08:00
David Gageot 92ce49b367 Put all core drivers in docker-machine binary
Signed-off-by: David Gageot <david@gageot.net>
2015-12-02 18:48:19 +01:00
David Gageot e35b169139 Merge pull request #2441 from jeanlaurent/support-load-driver-error
Display driver in error without crashing
2015-12-02 18:42:09 +01:00
Jean-Laurent de Morlhon f9f886f529 Display driver in error without crashing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 18:27:21 +01:00
Anil Belur 22cacbf152 Fixes #2451 ensure filters `<key>` and `<value>` work when case-insensitive
Added unit tests to verify filters

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 22:15:03 +05:30
David Gageot d7d6ca205a Merge pull request #2450 from askb/1931_full_disk
Fixes #1931 - config.json integrity when disk is full
2015-12-02 17:22:32 +01:00
Anil Belur 1a3c3898c1 Fixes #1931
Now this change ensures `config.json` is first written into a temp-file and
rename into the original file, if no errors from the FS. If ENOSPC occurs on write,
when the machine is restarted, the previous `config.json` is still available on startup.

Extended `TestStoreSave()` to check for any residual config files in the
machine directory.

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 21:42:01 +05:30
David Gageot df20cc4713 Merge pull request #2476 from jeanlaurent/0.5.0-compatibility
Fix for #2474 - docker-machine 0.5.1+ is incompatible with 0.5.0 drivers
2015-12-02 16:45:50 +01:00
Jean-Laurent de Morlhon 225abe05fe Move heartbeat code after getversion
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 16:29:08 +01:00
Jean-Laurent de Morlhon 88f6fce204 Fix for #2474
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 16:29:08 +01:00
Jean-Laurent de Morlhon a8b7f74b88 Merge pull request #2477 from zchee/rename_xhyve_driver
Rename xhyve driver
2015-12-02 15:06:23 +01:00
Koichi Shiraishi b0e0a564c9 Rename xhyve driver
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2015-12-02 21:38:38 +09:00
David Gageot 5ccd7f57e7 Merge pull request #2475 from dgageot/remove-flag
Remove redundant flag in integration tests
2015-12-02 12:07:51 +01:00
David Gageot b356a2249e Remove redundant flag in integration tests
Signed-off-by: David Gageot <david@gageot.net>
2015-12-02 11:51:29 +01:00
David Gageot 3d55545ba7 Merge pull request #2404 from askb/2349_rm_confirm
2349 rm should ask for confirmation before proceeding
2015-12-02 11:50:22 +01:00
Anil Belur 77fba72d13 Fixes #2349 - rm get user confirmation before proceeding further
* adds new flag `-y` prompting for user confirmation before removal
* Modified existing integration tests to work with the fix #2349.
* Added tests for checking user confirmation, updated the test cases use sub-shell with `|`
* Updated the reference docs for rm sub-command

incorporated changes by @dgageot, @jeanlaurent and @nathanleclaire

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 09:17:33 +05:30
Nathan LeClaire 650bd3384d Merge pull request #2448 from grampajoe/virtualbox-natdns
Add the --virtualbox-host-dns-resolver flag
2015-12-01 18:18:26 -08:00
Joe Friedl b2c9366245 Add the --virtualbox-host-dns-resolver flag
Signed-off-by: Joe Friedl <joe@joefriedl.net>
2015-12-01 21:03:51 -05:00
Nathan LeClaire ee530831c3 Merge pull request #2466 from ubiquityhosting/master
adding Ubiquity to driver list
2015-12-01 15:45:20 -08:00
Nathan LeClaire 609c74af3b Merge pull request #2467 from jeanlaurent/virtualbox-proxy-dns
Allow virtualbox DNSProxy override
2015-12-01 15:45:07 -08:00
Justin Canington 6b293a415a adding Ubiquity to driver list
Signed-off-by: Justin Canington <justin.canington@nobistech.net>
2015-12-01 15:21:32 -07:00
Jan Broer 59d7c3ca61 Enhances Digitalocean driver to support creating Droplets with user-data
Signed-off-by: Jan Broer <janeczku@yahoo.de>
2015-12-01 21:22:26 +01:00
Jean-Laurent de Morlhon 98777f6774 Merge pull request #2468 from jeanlaurent/config-fish
Fix docker-machine config does not work on fish
2015-12-01 18:44:23 +01:00
Jean-Laurent de Morlhon 75fd2cdac0 Fix for #2415
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-01 17:09:40 +01:00
Jean-Laurent de Morlhon b7b767aafe Allow virtualbox DNSProxy override
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-01 16:02:20 +01:00
Jean-Laurent de Morlhon cf85b11344 Merge pull request #2463 from xiaohui/doc/ucloud-driver-reference
Add UCloud driver
2015-12-01 10:45:21 +01:00
Xiaohui Liu 69fcbb8505 Add UCloud driver
Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-12-01 17:40:49 +08:00
David Gageot f0757312e5 Merge pull request #2461 from frapposelli/fusion-mount-id-fix
Add id/gid option to mount when using vmhgfs
2015-12-01 10:33:46 +01:00
David Gageot c0478b8dc7 Merge pull request #2462 from nathanleclaire/bump_v_0.5.3-dev
Update to v0.5.3-dev
2015-12-01 09:19:49 +01:00
Nathan LeClaire 00cb219dd9 Update to v0.5.3-dev
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-30 23:58:40 -08:00
Nathan LeClaire 0456b9fc8f Merge pull request #2460 from nathanleclaire/bump_v0.5.2
Bump to version 0.5.2
2015-11-30 21:59:00 -08:00
Fabio Rapposelli 40aab51e6a
Add id/gid option to mount when using vmhgfs
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
2015-12-01 05:47:37 +01:00
Nathan LeClaire 6887e5fec2 Bump to version 0.5.2
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-30 17:02:19 -08:00
Nathan LeClaire f7ea3d9f19 Merge pull request #2434 from dgageot/check-after-create
Check machine after create
2015-11-30 16:24:43 -08:00
Nathan LeClaire d18a5f62d9 Merge pull request #2459 from dgageot/remove-fake-api
Remove duplicated test FakeApi
2015-11-30 13:01:58 -08:00
David Gageot 643b7349f7 Remove duplicated FakeApi
Signed-off-by: David Gageot <david@gageot.net>
2015-11-30 18:30:00 +01:00
David Gageot f00b0b83cf Merge pull request #2458 from jeanlaurent/typo
Typo in EC2 Driver
2015-11-30 17:37:30 +01:00
Jean-Laurent de Morlhon 6d5bc99387 Typo
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-30 17:23:11 +01:00
David Gageot 47df63e932 Merge pull request #2454 from dgageot/google
Improve Google Driver
2015-11-30 16:04:47 +01:00
David Gageot ec76843e03 Cosmetics
Signed-off-by: David Gageot <david@gageot.net>
2015-11-30 14:24:58 +01:00