Commit Graph

63 Commits

Author SHA1 Message Date
David Gageot cd9301e252 Merge pull request #2730 from dgageot/close-api
Close api
2016-01-05 15:50:44 +01:00
David Gageot b7fa3327cf Merge pull request #2733 from dgageot/2688-run-docker-machine-from-path
Run docker-machine from the PATH for core drivers
2016-01-04 16:28:33 +01:00
David Gageot 67f8b19c9b Don't use global variables. Make the Api closeable
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:59:15 +01:00
David Gageot 3990815e10 FIX #2688 - Run docker-machine from the PATH for core drivers
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:50:04 +01:00
David Gageot 9354fed274 Remove some duplication related to swarm
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:40:04 +01:00
David Gageot c180a7962b Fix race condition. cmdWait will do the closing
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 13:26:47 +01:00
David Gageot b185bb3dbd Keep on heartbeating after failure
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
David Gageot 501c4f3460 Read only if there is something to read
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
Nathan LeClaire 232c0ea37e Fix truncated plugin binary logs
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-28 11:49:38 +01:00
David Gageot 34f6e20165 Print an error when a driver cannot be closed
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
David Gageot 0cd8312e72 Remove dead code
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:37:32 +01:00
David Gageot f56dab0676 Make test 10s faster
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:37:32 +01:00
David Gageot 89d9e2fe90 Close drivers on exit
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:44:42 +01:00
David Gageot 6f8a6dd272 FIX #2641 Digital Ocean Custom SSH port
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 16:16:33 +01:00
Nathan LeClaire 98ca59394a Increase heartbeat interval and timeout
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-18 18:53:01 -08:00
Jean-Laurent de Morlhon aa9ff22395 Test distinguish stdout from stderr
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-16 16:57:14 +01:00
Jean-Laurent de Morlhon 854219d44a Clearer writer name
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-16 16:51:03 +01:00
Nathan LeClaire 06c97cfb17 Fix STDOUT and STDERR direction based on Log.* calls
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-15 18:01:42 -08:00
Nathan LeClaire d29a42ebc6 Merge pull request #1299 from hairyhenderson/ssh-agent-support-1291
Allowing generic driver to use ssh-agent to get identities
2015-12-11 17:31:55 -08:00
David Gageot f3775f774c FIX #2553 Fusion Driver is supported only on darwin
Signed-off-by: David Gageot <david@gageot.net>
2015-12-11 15:46:47 +01:00
Jean-Laurent de Morlhon 4f0c24483b bugsnag integration
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-10 17:05:05 +01:00
Dave Henderson cf6136fed0 Allowing generic driver to use ssh-agent to get identities
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-12-09 09:36:08 -05:00
David Gageot 92854bd31f Merge pull request #2523 from dgageot/2510-support-dns-names
FIX 2510 Support DNS names
2015-12-08 10:54:40 +01:00
David Gageot eeb568fd27 FIX 2510 Support DNS names
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:11:33 +01:00
Jean-Laurent de Morlhon 4792177b11 Logrus Machine Logger
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 18:36:48 +01:00
Jean-Laurent de Morlhon 010a1c76e2 Use logrus
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 11:08:50 +01:00
Jean-Laurent de Morlhon 2e79f67e93 Cleanup stdout/stderr log initialization
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01: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
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
David Gageot 518e3b8bde Rename to rawDriver
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 14:08:09 +01:00
Nathan LeClaire 08565fd198 Merge pull request #2396 from allingeek/master
Decoupled RPC Types from API
2015-11-25 22:03:29 -08:00
Jeff Nickoloff c4a72491ec Decoupled RPC Types from API
Added compatibility for both 5.0 and 5.1 RPC plugins.
Addresses #2325

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>

	modified:   libmachine/drivers/plugin/register_driver.go
	modified:   libmachine/drivers/rpc/client_driver.go
2015-11-25 13:02:31 -08:00
Jean-Laurent de Morlhon 67b83f518f Fix #2410
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Reviewed-by: David Gageot <david@gageot.net>
2015-11-25 18:27:35 +01:00
Nathan LeClaire 19ce7b79bd Revise CommandLine interface to contain libmachine client and store
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-23 19:29:20 -08:00
David Gageot 6de1fd13d3 Plugin's stdout shouldn't show `OUT`
Signed-off-by: David Gageot <david@gageot.net>
2015-11-18 16:45:58 +01:00
Jean-Laurent de Morlhon fe37f1fb0d Fix #2204 broken env unset
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-12 17:32:27 +01:00
Olivier Gambier 89d9854943 Another pass at linting
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-10 16:58:14 +01:00
Nathan LeClaire bc7da2b0fa Merge pull request #2172 from dgageot/2154-query-virtualbox-serially
FIX #2154 query virtualbox serially
2015-11-09 12:00:03 -08:00
David Gageot 68092b3524 FIX #2154 query virtualbox serially
Signed-off-by: David Gageot <david@gageot.net>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-07 16:14:25 +01:00
Nathan LeClaire b92a6fd3ce Allow plugins to write to STDOUT
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 18:21:38 -08:00
Olivier Gambier d2ada6488c Lint
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
David Gageot 11922080a1 FIX #2171 Fix faulty flag and add tests for SetConfigFromFlags
Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 18:57:03 +01:00
Nathan LeClaire 6be950f1c0 Merge pull request #2117 from dmp42/08-carry-on-2033
Carry on commits from #2033
2015-11-04 16:41:40 -08:00
Nathan LeClaire 47aa16cff4 Merge pull request #2135 from janeczku/plugin-versioning
Fail gracefully when plugin binary implements outdated API
2015-11-04 14:40:54 -08:00
Jan Broer 66ca5b07a2 Fail gracefully when plugin binary implements outdated API
Signed-off-by: Jan Broer <janeczku@yahoo.de>
2015-11-04 14:24:01 +01:00
Nathan LeClaire 9a4bc9a20d Ensure that ls will still work when plugin cannot be found
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-03 11:35:30 -08:00
Olivier Gambier ae2d344c2b Carry on commits from #2033
A couple of small cleanup and enhancements that were dropped after the revert.

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-30 16:33:26 -07:00
Nathan LeClaire 3dd578318a Stop heartbeat when there is an issue connecting to the server
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-26 12:55:48 -07:00
David Gageot 57dc1156de Revert "Remove duplication over GetIP"
This reverts commit 99aacc7b79.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 18:47:03 +01:00