docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,869 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

240 Commits

Author SHA1 Message Date
David Gageot 518e3b8bde Rename to rawDriver 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-26 14:08:09 +01:00
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
Nathan LeClaire 17f0a32b79 Ensure log writes only to os.Stderr for env and config command 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-19 17:30:18 -07:00
Dave Henderson 486e359e63 Fixing JSON marshaling of large numbers during migration 
- Added some context to an error message - it's useful to know _which_
  plugin failed when invoking the binary failed
- Replaced `json.Umarshal` with a `json.Decoder`, so that the
  `UseNumber` function can be called, which prevents large integers from
  being interpreted as `float64`s.
- Fixed a couple `log.Warn` calls that should've been `log.Warnf`

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-10-19 18:00:19 -04:00
Nathan LeClaire c8edb33ecd Move towards using external binaries / RPC plugins 
- First RPC steps

- Work on some flaws in RPC model

- Remove unused TLS settings from Engine and Swarm options

- Add code to correctly encode data over the network

- Add client driver for RPC

- Rename server driver file

- Start to make marshal make sense

- Fix silly RPC method args and add client

- Fix some issues with RPC calls, and marshaling

- Simplify plugin main.go

- Move towards 100% plugin in CLI

- Ensure that plugin servers are cleaned up properly

- Make flag parsing for driver flags work properly

Includes some work carried from @dmp42 updating the build process and
tests to use the new method.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-16 16:34:56 -07:00
Olivier Gambier 53ace516a4 Merge pull request #1960 from dgageot/1914-create-ignores-trailing-options 
FIX #1914 Reject command lines with trailing flags
 2015-10-14 10:28:38 -07:00
Nathan LeClaire 998ada5303 Fix Windows SSH issues 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-13 16:42:08 -07:00
David Gageot cd80b70d26 FIX #1914 Reject command lines with trailing flags 
Signed-off-by: David Gageot <david@gageot.net>
 2015-10-13 16:29:28 +02:00
Nathan LeClaire 571712122d Merge pull request #1909 from skatsuta/saved-host-active 
Change 'ls' to not report 'Saved' hosts as active when $DOCKER_HOST is not set
 2015-10-08 11:00:45 -07:00
Soshi Katsuta 5af32bcdd3 commands: make `ls` to not report saved hosts to be active when $DOCKER_HOST is not set 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-10-09 00:59:33 +09:00
Nathan LeClaire 94c551b964 Fix broken --storage-path flag 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-10-07 13:31:00 -07:00
Nathan LeClaire bd03e83239 Merge pull request #1873 from djimenez/detectShellWindows 
Issue #1867 improve detectShell for windows
 2015-10-05 13:32:53 -07:00
Kazuyuki SUZUKI 2bc53a6ac3 Add argument assertion to inspect/status/url commands 
Signed-off-by: Kazuyuki Suzuki <kechol28@gmail.com>
 2015-10-01 14:15:29 +09:00
Alexey Grachov b970dddc8b Remove dead code. 
Function getMachineDir is not used.

Signed-off-by: Alexey Grachov <grachov.alexey@gmail.com>
 2015-09-29 20:30:20 +03:00
Nathan LeClaire 0a2b9c2784 Fix flag accidentally left out in PR carry 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-09-23 17:57:52 -07:00
Fabian Ruff d22a4118d0 --no-proxy flag for env command 
This optinal flag will add the docker host to the no_proxy environement variable. This is useful for local providers (e.g. virtualbox, fusion) in environments where an http_proxy is set and docker by default tries to connect to the ip via the proxy.

Signed-off-by: Fabian Ruff <fabian@progra.de>
 2015-09-23 14:48:01 -07:00
Nathan LeClaire b5927f10c4 Make libmachine usable by outside world 
- Clear out some cruft tightly coupling libmachine to filestore

- Comment out drivers other than virtualbox for now

- Change way too many things

- Mostly, break out the code to be more modular.

- Destroy all traces of "provider" in its current form.  It will be
brought back as something more sensible, instead of something which
overlaps in function with both Host and Store.

- Fix mis-managed config passthru

- Remove a few instances of state stored in env vars

- This should be explicitly communicated in Go-land, not through the
shell.

- Rename "store" module to "persist"

- This is done mostly to avoid confusion about the fact that a concrete
instance of a "Store" interface is oftentimes referred to as "store" in
the code.

- Rip out repetitive antipattern for getting store

- This replaces the previous repetive idiom for getting the cert info, and
consequently the store, with a much less repetitive idiom.

- Also, some redundant methods in commands.go for accessing hosts have
either been simplified or removed entirely.

- First steps towards fixing up tests

- Test progress continues

- Replace unit tests with integration tests

- MAKE ALL UNIT TESTS PASS YAY

- Add helper test files

- Don't write to disk in libmachine/host

- Heh.. coverage check strikes again

- Fix remove code

- Move cert code around

- Continued progress: simplify Driver

- Fixups and make creation work with new model

- Move drivers module inside of libmachine

- Move ssh module inside of libmachine

- Move state module to libmachine

- Move utils module to libmachine

- Move version module to libmachine

- Move log module to libmachine

- Modify some constructor methods around

- Change Travis build dep structure

- Boring gofmt fix

- Add version module

- Move NewHost to store

- Update some boring cert path infos to make API easier to use

- Fix up some issues around the new model

- Clean up some cert path stuff

- Don't use shady functions to get store path :D

- Continue artifact work

- Fix silly machines dir bug

- Continue fixing silly path issues

- Change up output of vbm a bit

- Continue work to make example go

- Change output a little more

- Last changes needed to make create finish properly

- Fix config.go to use libmachine

- Cut down code duplication and make both methods work with libmachine

- Add pluggable logging implementation

- Return error when machine already in desired state

- Update example to show log method

- Fix file:// bug

- Fix Swarm defaults

- Remove unused TLS settings from Engine and Swarm options

- Remove spurious error

- Correct bug detecting if migration was performed

- Fix compilation errors from tests

- Fix most of remaining test issues

- Fix final silly bug in tests

- Remove extraneous debug code

- Add -race to test command

- Appease the gofmt

- Appease the generate coverage

- Making executive decision to remove Travis coverage check

In the early days I thought this would be a good idea because it would
encourage people to write tests in case they added a new module.  Well,
in fact it has just turned into a giant nuisance and made refactoring
work like this even more difficult.

- Move Get to Load
- Move HostListItem code to CLI

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-09-23 12:30:15 -07:00
Nathan LeClaire 2a15d98575 First steps to make ssh command smoother 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-09-21 12:16:47 -07:00
Donovan Jimenez 1dfca96c69 Issue #1867 improve detectShell for windows 
newer versions of git bash use mintty which doesn't set TERM=cygwin but
does set SHELL appropriately. Allow for SHELL to be detected on windows
and only output the message if its not.

Signed-off-by: Donovan Jimenez <donovan.jimenez@gmail.com>
 2015-09-17 15:53:33 -04:00
Nathan LeClaire 993b5f557f Merge pull request #1810 from xiaohui/cleanup 
cleanup log.*ln and correct typos error
 2015-09-16 16:38:40 -07:00
Matt McNaughton a0b9d179b1 Fix Go Vet errors 
This commit makes no changes to code execution, but rather resolves some
`go vet` errors, the majority of which relate to `fatal` being used
instead of `fatalf` during testing.

Signed-off-by: Matt McNaughton <mattjmcnaughton@gmail.com>
 2015-09-14 22:37:16 -04:00
Xiaohui dcdd1a4757 cleanup log.*ln, unuseful methods, some typos error … 
1. cleanup log.*ln for #1081
2. add "\n" to config command
3. typos error
4. remove unuseful methods: getBasedir@commands.go, and
GetDefaultTestHost@commands_test

Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
 2015-09-14 15:25:50 +08:00
Soshi Katsuta 6496c44261 commands: show "-" in the ACTIVE column for inactive machines 
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp>
 2015-08-19 01:04:48 +09:00
Evan Hazlett c1acb74d7a Merge pull request #1508 from ericsage/filter_names 
Add name filter for #1488
 2015-08-11 06:33:09 -04:00
Dave Henderson fb0af73b80 Verifying the --swarm-discovery flag 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-07-29 08:01:18 -04:00
Eric Sage b333ea5294 Add regex based name filter to ls command. 
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add regex support

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Allow bad regex passthrough to reg string amtch

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add unit test

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add integration tests

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>

Add documentation for name filter.

Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
 2015-07-22 21:06:26 -04:00
Nathan LeClaire 03d4683755 Merge pull request #1503 from sergiobuj/add_status_command 
Add status command
 2015-07-22 15:55:45 -07:00
Ryan Grothouse d553a2c757 added support for setting environment variables in docker engines 
Signed-off-by: Ryan Grothouse <rgrothouse@gmail.com>
 2015-07-16 16:12:06 -04:00
tgic d5f3f37d8f change inspect output to stdout (was stderr) 
Signed-off-by: tgic <farmer1992@gmail.com>
 2015-07-15 20:35:48 +08:00
Sergio Botero 918ed6a135 Add integration test for status command 
Use `log.Info` instead of `fmt.Println`

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
 2015-07-14 19:10:43 -07:00
Sergio Botero 87cf7e222e Add status command 
closes #1471 by adding the status command that prints the state of a
machine.

Signed-off-by: Sergio Botero <sergiobuj@gmail.com>
 2015-07-14 19:10:40 -07:00
Dave Henderson f2284b2bd5 Just informing the user that re-eval may be necessary, instead of going to the trouble of trying to detect IP changes 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-07-13 20:36:05 -04:00
Dave Henderson 07f2972dda Warning user that the active machine was restarted and may have a new IP 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-07-13 20:34:19 -04:00
Nathan LeClaire cd55ca0030 Merge pull request #1506 from ericsage/1502 
Return better error for issue #1502.
 2015-07-13 17:33:30 -07:00
Eric Sage 6410da8f34 Switch to errors.New 
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
 2015-07-13 20:09:59 -04:00
Eric Sage b75b5d618c Change error message 
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
 2015-07-13 17:45:46 -04:00
Evan Hazlett f8456d8bba Merge pull request #1494 from nathanleclaire/rename_machine_to_provider 
Rename libmachine.Machine to libmachine.Provider
 2015-07-11 20:33:22 -06:00
Eric Sage 8a77935cd4 Return better error for issue #1502. 
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
 2015-07-11 00:49:59 -04:00
Nathan LeClaire 3eaab15a5b Rename libmachine.Machine to libmachine.Provider 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-09 10:24:29 -07:00
Evan Hazlett 69dc9fd7f3 Merge pull request #1273 from hairyhenderson/default-driver-impl 
refactor: Extracting a base Driver struct
 2015-07-09 01:59:05 -06:00
Dave Henderson 3d002187fe Refactoring drivers to embed drivers.DefaultDriver 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-07-07 11:24:00 -04:00
Vincent Bernat 4ec3f206b4 exoscale: use `StringSlice` to specify security groups 
This mean that the option has to be repeated to specify multiple
security groups.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-30 10:59:23 +02: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
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
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 f82032b28d remove provider 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 10:41:03 -04:00
Evan Hazlett 91c618fd06 Merge pull request #1174 from nathanleclaire/ssh_backends 
Move to using SSH shellout by default, and Go native impl as a backup
 2015-05-21 10:22:45 -04:00
Nathan LeClaire 2f78b7f92a Move code to use SSH "backends" 
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-19 15:02:57 -07:00
Evan Hazlett 309afd1112 Merge pull request #1175 from hairyhenderson/add-machine-name-envvar-925 
Adding new DOCKER_MACHINE_NAME environment variable
 2015-05-19 15:28:13 -04:00
Dave Henderson 7b68762d36 Adding new DOCKER_MACHINE_NAME environment variable 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-14 22:43:39 -04:00
Nathan LeClaire 333b7e88a7 Implement docker-machine scp 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-13 17:22:42 -07:00
Evan Hazlett 00a2f7781f env: enable easier usage display 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-12 08:43:15 -04:00
Dave Henderson a3c8b3474e Adding --filter flag to ls command 
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-11 20:01:50 -04:00
Nathan LeClaire b672617287 Migrate engine-flag => engine-opt 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-11 11:57:09 -07:00
Evan Hazlett f3bcda1cff Merge pull request #1137 from nathanleclaire/fixup 
Fix formatting and non-returning of error
 2015-05-07 11:52:40 -07:00
Nathan LeClaire 8887ca2fed Fix formatting and non-returning of error 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 17:52:29 -07:00
Evan Hazlett 7aa8364a4a Merge pull request #1117 from ehazlett/fix-windows-shell-detection 
windows: fix shell detection to not bail on bash envs
 2015-05-06 15:54:37 -07:00
Nathan LeClaire 8c34f80940 Fix bug with quiet ls mode 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 11:48:16 -07:00
Evan Hazlett 3b0a32f6d8 Merge pull request #1118 from nathanleclaire/fix_env 
Fix failing env validation
 2015-05-05 14:33:08 -07:00
Nathan LeClaire 6bb56f91d3 Fix failing env validation 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-05 13:51:22 -07:00
Evan Hazlett c4dd9198c1
windows: fix shell detection to not bail on bash envs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 12:19:53 -07:00
Evan Hazlett 7fc50f3de3 add generic driver 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:04:47 -07:00
Darren Shepherd 43b5786001 Default storage driver to "" and let provisioner choose default 
The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-05 09:12:33 -07:00
Nathan LeClaire c602e69448 Read active host from DOCKER_HOST instead of from file 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-04 16:29:04 -07:00
Evan Hazlett 6a311b0069 Merge pull request #20 from exoscale/feature/exoscale-support 
driver: exoscale driver
 2015-05-01 16:31:31 -04:00
Evan Hazlett 15fb6c3d79 Merge pull request #1083 from ehazlett/docs-update-env-shell 
docs: update usage info for env shell options
 2015-05-01 16:11:31 -04:00
Evan Hazlett 092521a346 docs: update usage info for env shell options 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-01 14:55:50 -04:00
Dave Henderson 3739e4d067 Harmonizing drivers so IPAddress property is kept up-to-date 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-30 19:59:23 -04:00
Vincent Bernat fd569c8fdf driver: exoscale driver 
Add support for exoscale, a Swiss cloud provider. This pull "egoscale",
a Go binding for exoscale, in godeps.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-30 22:32:02 +02:00
Nathan LeClaire 142ffadc2c Refactor logging to focus on simple STDOUT/STDERR 
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-30 12:04:52 -07:00
Evan Hazlett 03c245cf4f Merge pull request #1033 from ehazlett/env-shell-selection 
shell selection for env
 2015-04-30 14:03:23 -04:00
Evan Hazlett 49686b9a91
better hint for windows shells 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-30 10:36:38 -04:00
Nathan LeClaire 2574c8ba5d Implement configurable engine options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-29 17:58:14 -07:00
Evan Hazlett 9aa861ea55 update usage hint for powershell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett 92f6b45de2 env-shell: fixed tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett 6b735677a0 do not hard code machine binary name in env command 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett 33d8058d38 shell selection: fix tests and add powershell test 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett e13e2b61c6 use template for shell config; more powershell and cmd fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett 7585680668 add export and clear env for powershell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett cba15e843f powershell support 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:34 -04:00
Evan Hazlett 13e1b1e867 Merge pull request #1058 from hairyhenderson/rm-report-success-on-multi-machines-1053 
Reporting success of each machine when removing multiples
 2015-04-29 09:21:06 -04:00
Dave Henderson 5b6cbe226d Sorting commands in alphabetical order 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-26 14:26:18 -04:00
Dave Henderson e55d9cb072 Reporting success of each machine when removing multiples 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-26 13:23:10 -04:00
Dave Henderson a0f079a627 Enhancing `docker-machine ip` to support multiple host arguments 
Fixes #999

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-22 22:10:45 -04:00
Simon Thulbourn f1d70a8027 Fix for SSH command 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-04-22 11:42:48 +01:00
Evan Hazlett 55a4a7c2f2 Merge pull request #921 from hairyhenderson/inspect-format-template 
Adding --format/-f option to inspect subcommand
 2015-04-21 08:00:54 -07:00
Simon Thulbourn 709b0a84e3 Add SSH client 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-04-21 15:37:09 +01:00
Dave Henderson 9af46e245f Changing template function name from prettyJSON to prettyjson 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:49:47 -04:00
Dave Henderson d40d18f9a8 Making sure all properties are available 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:27:38 -04:00
Dave Henderson c93a17481c Adding --format/-f option to `inspect` subcommand 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:27:38 -04:00
Dave Henderson 53ef9d7477 Refactoring commands.go into new commands package, with separate file for each subcommand 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-15 19:04:44 -04:00