Commit Graph

139 Commits

Author SHA1 Message Date
David Gageot 00f62150b4 FIX nil pointer dereference in machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:53:09 +01:00
David Gageot 6a1993664d FIX #1619 Timeout test for machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:49:56 +01:00
David Gageot 89fcca2879 Increase coverage of machine ls tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 08:48:07 +01:00
David Gageot 742cdb958b Add more command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-25 14:23:29 +01:00
Nathan LeClaire 47da7f8314 Add interfaces for CLI unit testing and env test
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-24 18:09:27 -08:00
David Gageot 9039cbba3d FIX #2086 Add an error column to ls
Signed-off-by: David Gageot <david@gageot.net>
2015-11-24 09:50:43 +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 c2be96eac8 Make user supplied input more obvious
Signed-off-by: David Gageot <david@gageot.net>
2015-11-23 15:52:39 +01:00
Jean-Laurent de Morlhon a55bba3ed2 Move tls-san flag to a local flag for create
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-23 12:40:07 +01:00
Jean-Laurent de Morlhon b6519d43e9 More readable code
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-23 12:22:57 +01:00
Sam Alba 5b453e6305 Implemented '--tls-san' global arg for adding extra SANs (subject alt names) to server-side certificates
Signed-off-by: Sam Alba <sam.alba@gmail.com>
2015-11-23 12:17:29 +01:00
Nathan LeClaire 42b6249a8c Vendor codegangsta/cli properly
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-20 18:20:11 -08:00
David Gageot e537a51926 Merge pull request #2352 from jeanlaurent/better-cli
Fix create usage & description in cli
2015-11-19 13:39:02 +01:00
Jean-Laurent de Morlhon 1521fed1ed Add a version command
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-19 12:42:32 +01:00
Jean-Laurent de Morlhon 91b64ff913 Fix create usage & description in cli
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-19 12:19:56 +01:00
Roman Coedo f81870e4f1 Global set for fish env
Using "set -x" only exports the variable in the local scope.
This is a limitation when an user needs to invoke "docker-machine" in a fish script.

Using "set -gx" instead exports the variable globally.

Signed-off-by: Roman Coedo <romancoedo@gmail.com>
2015-11-18 21:35:32 +01:00
David Gageot fa24554871 Merge pull request #2290 from dgageot/quality-03-simpler-test
Quality 03 simpler test
2015-11-18 09:40:25 +01:00
David Gageot 0c296783be Merge pull request #2289 from dgageot/quality-02-move-code
Quality 02 move code
2015-11-18 09:40:01 +01:00
Nick Gauthier a34a394810 skip printing swarm info when host options swarm info is nil
Fixes #2252 #2280

Signed-off-by: Nick Gauthier <ngauthier@gmail.com>
2015-11-16 15:54:16 +01:00
David Gageot a8e3ee868f Simpler test code
Signed-off-by: David Gageot <david@gageot.net>
2015-11-13 16:27:50 +01:00
David Gageot eb39f098d5 Move code where it's used
Signed-off-by: David Gageot <david@gageot.net>
2015-11-13 16:27:50 +01:00
David Gageot 8bbfc6ef2a Remove unused code
Signed-off-by: David Gageot <david@gageot.net>
2015-11-13 16:27:50 +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
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
Olivier Gambier d2ada6488c Lint
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
David Gageot 99d6fe134d Introduce CommandLine interface
Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 06:07:57 +01:00
Olivier Gambier 19fc49b58a Lint, step 1
The easy stuff

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-04 14:17:58 -08:00
David Gageot 8a452a9629 FIX #2064 Support local windows path
+ Use assert in tests
+ Improve parsing
+ Simplify code and tests

Signed-off-by: David Gageot <david@gageot.net>
2015-11-04 09:48:21 +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
Nathan LeClaire bccbe19a86 Merge pull request #2146 from nathanleclaire/rm_automatic_cert_regeneration
Remove automatic certificate regeneration
2015-11-02 22:14:22 -08:00
Nathan LeClaire f5b6c87e7c Remove automatic certificate regeneration
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-02 19:31:29 -08:00
Nathan LeClaire 060f0a0db2 Fix issues with create and ssh command help text
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-30 16:21:47 -07:00
David Gageot 86c52ec3e7 Make commands code easier to test
Signed-off-by: David Gageot <david@gageot.net>
2015-10-29 11:15:17 +01:00
Nathan LeClaire c04eb43021 Remove redundant error log
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-28 13:56:29 -07:00
Nathan LeClaire 9f01770d7e Merge pull request #2084 from dgageot/simpler-env-hints
Simpler code for env usage hints.
2015-10-27 11:59:51 -07:00
Nathan LeClaire 9fa2f73139 Merge pull request #2032 from hairyhenderson/make-active-work-with-swarm-1311
Returning active host when swarm is active
2015-10-26 12:54:44 -07:00
David Gageot 2d1e6d0163 Simpler code for env usage hints.
We can just output the original os.Args in the
eval call.

Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 10:31:18 +01:00
David Gageot ab1b0ca2e9 Remove dead code
Signed-off-by: David Gageot <david@gageot.net>
2015-10-26 09:35:12 +01:00
Dave Henderson ee4a357441 Returning active host when swarm is active
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-24 12:47:49 -04:00
Nathan LeClaire b038ff4020 Fixes https://github.com/docker/machine/issues/2062
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-23 13:58:32 -07:00
Olivier Gambier 4bd43d604f Merge pull request #2053 from nathanleclaire/rpc_heartbeat
Add heartbeat / automatic server cleanup code
2015-10-23 10:40:45 -07:00
Nathan LeClaire 76c7accda0 Add heartbeat / automatic server cleanup code
This replaces the previous method of attempting to clean up servers when
an unexpected exit occurs in the client (e.g. SIGINT or panic) by a
heartbeat protocol.  If the server does not hear from the connecting
client within a certain interval of time (500ms in this commit), it will
de-activate itself.  This prevents dangling Docker Machine server
processes from accumulating.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-22 19:44:35 -07:00
Nathan LeClaire 07bcb9a7aa Merge pull request #2058 from dgageot/improve-cmd-exe-support
improve cmd shell support
2015-10-22 11:59:55 -07:00
Stefan Scherer 1d3268d128 improve cmd shell support
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>

Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 12:15:33 +02:00
David Gageot e2b6a832ac Add more debug during certificates validation
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:11:31 +02:00
Nathan LeClaire cb473ad0a7 Merge pull request #2027 from dgageot/2019-fix-env-hints
FIX #2019 invalid env hints
2015-10-21 16:44:33 -07:00
David Gageot 6bbec2df68 Report VirtualBox errors
Signed-off-by: David Gageot <david@gageot.net>
2015-10-21 21:03:51 +02:00
David Gageot bd532747f1 FIX #2019 invalid env hints
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 17:58:35 +02:00
Nathan LeClaire 56f457c2ef Merge pull request #2013 from nathanleclaire/no_stdout_env_config
Ensure log writes only to os.Stderr for env and config command
2015-10-19 17:43:23 -07:00