Commit Graph

118 Commits

Author SHA1 Message Date
Evan Hazlett 1691d19c9d libmachine: split swarm and engine options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett 31b63a1204 libmachine: add engine and swarm options
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Evan Hazlett 27be8cf28e initial pass at internal api
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-19 18:09:30 -04:00
Dave Henderson 3dfc436e07 Revert "revert "Fixing `config` and `env` bad handling of paths with spaces""
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-19 10:03:42 -04:00
Evan Hazlett e781ae7269
revert "Fixing `config` and `env` bad handling of paths with spaces"
This causes a regression when using with the Docker CLI:

FATA[0000] Couldn't read ca cert
"/home/ehazlett/.docker/machine/machines/dev"/ca.pem

This reverts commit 3c57799534.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 22:10:07 -04:00
Evan Hazlett a0b0fd33bb Merge pull request #783 from hairyhenderson/env-config-quoted-paths-781
Fixing `config` and `env` bad handling of paths with spaces
2015-03-18 11:41:40 -04:00
Evan Hazlett 217f144d25
corrects the rm command line description
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-18 11:20:38 -04:00
Dave Henderson 3c57799534 Fixing `config` and `env` bad handling of paths with spaces
Fixes #781

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
2015-03-18 11:04:47 -04:00
Ahmet Alp Balkan c4b83b4935 Add natural sorting by host name to `ls` cmd
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2015-03-17 23:32:27 -07:00
Evan Hazlett 5403171328 ec2: fix bug where ip address was not updated upon restart
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
Evan Hazlett d221d8ee97 certs: check if remote is valid and regenerate if not
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-17 11:08:20 -04:00
Tianon Gravi d6e3dd6b06 Add "eval" to every invocation of "docker-machine env"
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-03-16 18:33:24 -06:00
Nathan LeClaire f890f9b6cd Implement wait for desired state before exiting
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-03-13 10:26:51 -07:00
Evan Hazlett 72f05505fa
vmwarevsphere: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:41:02 -04:00
Evan Hazlett 9e27af64e3
vmwarefusion: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:27:11 -04:00
Evan Hazlett bff7e978cf
vmwarevcloudair: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-10 00:11:04 -04:00
Evan Hazlett 4b034fd1b6
softlayer: update with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:58:52 -04:00
Evan Hazlett 272d15343a
rackspace: enable with new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:39:44 -04:00
Evan Hazlett 6c931dadde
openstack: update for new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:27:17 -04:00
Evan Hazlett 7e362cf4a3
hyperv: updated for new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:24:11 -04:00
Evan Hazlett ec91959979
google: updated to new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 23:18:18 -04:00
Evan Hazlett d2869cbd38 Merge remote-tracking branch 'origin/master' into driver-refactor 2015-03-09 22:53:41 -04:00
Evan Hazlett 52a3019d00
azure: updated to driver interface; refactored common GetSSHCommandFromDriver for those that need it
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:53:21 -04:00
Evan Hazlett 7404e4d3ff Merge pull request #736 from shawnzhu/tlsverify-flag
uses --tlsverify instead of --tls in config output
2015-03-09 22:49:07 -04:00
Evan Hazlett 51aa826e14
digitalocean: update to driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 22:20:47 -04:00
Evan Hazlett 275cb37602
virtualbox: update to new driver interface
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 17:53:30 -04:00
Evan Hazlett e43da502f3
refactor commands.go to use host ssh and upgrade
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-09 12:49:46 -04:00
Ke Zhu 1bb4b95110 keep using --tlsverify between config and env commands
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-03-06 22:22:00 -05:00
Evan Hazlett 0748d70b4e
consistent naming for DOCKER_TLS_VERIFY env var
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-03-06 16:29:17 -05:00
Jonathan Morley 0462a3b2fc Add semicolons to fish output for docker-machine env command
This allows fish users to use `eval (docker-machine env ...)`

Signed-off-by: Morley, Jonathan <morley.jonathan@gmail.com>
2015-03-03 06:41:08 -05:00
Evan Hazlett 1bf70a15f0
show fish usage upon create
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-27 19:15:02 -05:00
Ke Zhu bc91ba8577 keep machine config and machine env consistent
Signed-off-by: Ke Zhu <kzhu@us.ibm.com>
2015-02-27 11:21:16 -05:00
Nathan LeClaire 27e7f54b3a Fix active host implementation for start, stop, etc.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-26 19:42:57 -08:00
Fabian Ruff 722a7cd28a add trailing newline when unsetting env in fish
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-02-26 14:08:33 +01:00
Evan Hazlett 7a101ac92c
refactor directories to machines, certs, cache
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-25 12:32:41 -05:00
Nathan LeClaire b01ce736d2 Finish implementing multi-machine task execution
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-24 11:08:49 -08:00
Evan Hazlett 9ca79892a6 wip: commands across nodes
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-24 10:21:56 -08:00
Ben Firshman d80a28c675 Merge pull request #585 from ehazlett/command-docs
add better docs to command help
2015-02-24 10:48:39 +00:00
Evan Hazlett 5a5e8692fe Merge pull request #591 from ehazlett/no-error-for-ls
do not error with no active host for ls
2015-02-23 17:01:21 -05:00
Evan Hazlett 779118147e
do not error with no active host for ls
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 14:54:31 -05:00
Nathan LeClaire 68e0fda49d Add docker-machine env unset
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-23 11:27:01 -08:00
Evan Hazlett cf1328ffb1
move extended help to command descriptions
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 11:45:14 -05:00
Evan Hazlett b71aad0501
fix help for url; formatting
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 11:14:02 -05:00
Evan Hazlett 4de170ba9e
add better docs to command help
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-23 10:33:27 -05:00
Evan Hazlett 82a686fc7c
remove generate-swarm-token command; fix tests; update docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:36:06 -08:00
Evan Hazlett a48dfd3448 use swarm master also as node
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett 3a3ef6f45e add discovery to machine config; show swarm membership
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett a949e12b6e store swarm config in driver; vendor Godeps; generate swarm token
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:21 -08:00
Evan Hazlett a73deea5d0 swarm provisioning
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-20 13:07:20 -08:00
Fabian Ruff bb1c52ac88 support for fish shell in env command
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-02-19 13:21:54 +01:00