docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
820 Commits 21 Branches 28 Tags 816 MiB
Commit Graph

135 Commits

Author SHA1 Message Date
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
Evan Hazlett a1013cf389 Merge pull request #516 from bfirsh/clearer-instructions-for-setting-up-your-shell 
Clearer instructions for setting up your shell
 2015-02-09 10:21:33 -05:00
Ben Firshman 3739a85a39 Clearer instructions for setting up your shell 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-09 12:27:11 +00:00
Evan Hazlett bba82e66ac only show hyper-v on windows 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-06 08:48:36 -05:00
Jeff Mendoza edccb4a643 Hyper-V now only build on Windows. 
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
 2015-02-06 08:47:51 -05:00
Jeff Mendoza cdf8d21873 Hyper-V compiles and works, still needs identity auth. 
Signed-off-by: Jeff Mendoza <jeffmendoza@live.com>
 2015-02-06 08:47:51 -05:00
Evan Hazlett 340afa10aa
remove debug logging 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-04 16:36:36 -05:00
Evan Hazlett 7ce53190cf
fixes error when running config against no active host 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-04 11:28:49 -05:00
Nathan LeClaire 60fdb938ec Make config and env return empty URL instead of error 
This will return an empty URL and consequently the Docker client will
fail to connect instead of spitting out an illegible error with the
subshell method.  Hopefully this will tip users off to the underlying
source of the problem.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-02-03 11:31:57 -08:00
Evan Hazlett 2f6d9a2418
fixes cli arg bugs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-03 12:44:06 -05:00
Nathan LeClaire 22eae1296d Fix usage of flag parsing terminator 
There is no need to check for "--" manually.  cli will do this for us.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-02-02 12:10:56 -08:00
Simon Thulbourn 3d9f1ed8e8 move cert creation to create commandw 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-02-02 15:41:23 +00:00
Simon Thulbourn 5c8bd32753 Use whatever is after -- as the SSH command. 
Updates the codegansta/cli package.

Change the way commands are detected

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-30 11:11:48 +00:00
Richard Weber 183d4be3c4 Change message to use machine env. 
Signed-off-by: Richard Weber <riche.weber@gmail.com>
 2015-01-30 01:07:42 +02:00
Evan Hazlett eafc0048f0
rename shellinit to env 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-28 13:01:25 -05:00
Evan Hazlett 3d7ff94ff2
use DOCKER_HOST instead of DOCKER_URL 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-24 00:25:07 -05:00
Evan Hazlett a60f0e672e add shellinit command for displaying environment for docker client 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-23 23:18:38 -05:00
Evan Hazlett b0e329b53e use separate dir for client certs so docker client can use them 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-23 22:31:53 -05:00
Evan Hazlett 74f9bcebc7 only create ca and client cert once; create server keys each time; add serverAuth to ext usage 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-23 22:31:53 -05:00
Simon Thulbourn 4ee78fa097 Change binary name to docker-machine 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-22 18:50:08 +00:00
Evan Hazlett a3e996e1e0 Merge pull request #51 from cpuguy83/add_softlayer 
Add softlayer driver
 2015-01-20 16:46:02 -05:00
Evan Hazlett e1d0c97770
do not autoremove machine on error (prevents removing existing machines) 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-19 13:52:25 -05:00
Brian Goff 8d8c6fe71d Add softlayer driver 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-01-19 12:29:56 -05:00
Nathan LeClaire 4bc7dc5676 Correct *.pem names to work with DOCKER_CERT_PATH 
See https://github.com/docker/docker/blob/master/docker/docker.go#L22

This is how things currently work with b2d.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-01-16 13:56:51 -08:00
Evan Hazlett 090e3328c8 refactor b2d retrieval for fusion/vbox 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:25 -05:00
Evan Hazlett d1ece77684 updated readme for TLS 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:25 -05:00
Evan Hazlett 35e0351889 tls support for vcloud air 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:24 -05:00
Evan Hazlett 9664d68889 rebase and updated fusion to work with standard docker b2d 1.4.1 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:24 -05:00
Evan Hazlett 4a47ce01fe updated google driver; added StartDocker and StopDocker to driver 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:24 -05:00
Evan Hazlett 4534944f6a use tls for auth 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-15 22:56:24 -05:00
Evan Hazlett 6ea17eee0d Merge pull request #262 from sthulb/panics 
Fix for panics when no active host is set
 2015-01-15 22:55:43 -05:00
Evan Hazlett 7efdb5a0ca Merge pull request #267 from sthulb/create-oops 
Stop machine from overwriting an existing machine
 2015-01-15 12:19:32 -05:00
Ash Wilson c12d3f8ecd Initial cut at a Rackspace driver. 
* Wrap openstack.Client in an interface.
* Alternate openstack Driver creation method.
* Register the Rackspace driver in commands.go.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
 2015-01-14 22:01:31 +01:00
Guillaume Giamarchi f6b0c81996 Add OpenStack driver 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2015-01-14 22:01:31 +01:00
Simon Thulbourn e479c82f64 Fix for panics when no active host is set 
By adding some better error checking on `store.GetActive`, we can stop
getting panics on some commands

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-14 18:16:34 +00:00
Simon Thulbourn 912ec5cc24 Stop machine from overriding an existing machine 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-14 17:55:21 +00:00
Simon Thulbourn c8b36dfbfc Add unknown command help 
Spits out "machine: '<command>' is not a machine command see 'machine
--help'" to be inline with Docker

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-01-09 23:38:59 +00:00
Evan Hazlett 5a251c5d1b Merge pull request #6 from cloudnativeapps/vmw-drivers 
VMware host drivers for Fusion, vSphere and vCloud Air
 2015-01-08 11:11:39 -08:00
Fabio Rapposelli 6b31904d43 Godeps save and enable commands 
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
 2015-01-08 11:00:54 +01:00
Evan Hazlett df5ecadf80
logging updates from @nathanleclaire 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-07 17:37:17 -08:00
Evan Hazlett 414f94b7d1 add cleanup for create failure 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-01-07 17:35:33 -08:00
Nathan LeClaire 062b7fced7 Move closures to be named functions 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-01-07 14:33:06 -08:00
Nathan LeClaire 80436e9b66 Add getHostState test 
Also took this opportunity to move getHostState to the bottom of the
file following the existing pattern.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-01-07 10:31:09 -08:00
Nathan LeClaire 782f3faa89 Refactor ls to use a channel instead 
This eliminates the "sync" dep and makes the code easier to read.

Share by communicating, don't communicate by sharing ;)

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-01-06 02:22:31 -05:00
Ben Firshman 37662736a7 Merge pull request #123 from ehazlett/integration-tests 
Integration tests
 2014-12-31 17:36:08 +00:00
Ben Firshman df56d070f0 Merge pull request #54 from dlorenc/master 
GCE Driver.
 2014-12-31 17:30:56 +00:00
Evan Hazlett d52399a22d
fixes from @nathanleclaire 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-30 15:11:24 -05:00
Evan Hazlett 1b1e678b76 added helper script for running tests in docker 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-30 12:59:04 -05:00
Simon Thulbourn 003c0dd093 Configurable storage path 
As per #77, this PR adds --storage-path/MACHINE_STORAGE_PATH (env var)
to allow the user to specify where they want to store the machine db

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-26 19:57:48 +00:00
Johan Euphrosine 47004d74d6 drivers: rename googlecomputeengine to google 
Signed-off-by: Johan Euphrosine <proppy@google.com>
 2014-12-18 11:28:55 -08:00
dlorenc 17d8b16a37 GCE Driver. 
Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
 2014-12-15 20:23:38 -08:00
Ben Firshman a913c06888 Restore sorting of ls output 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-15 10:46:35 -08:00
Ben Firshman 91172449c0 Handle errors in commands 
Some errors were swallowed entirely, some didn't print the error
message.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-15 10:45:55 -08:00
Ben Firshman da95ea3968 Merge pull request #103 from ggiamarchi/machine-name-optional 
Make machine name optional in CLI
 2014-12-15 17:53:30 +00:00
Guillaume Giamarchi d730d39c48 Avoid code duplication 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-14 02:11:24 +01:00
Guillaume Giamarchi 8613b941e8 Make machine name optional in CLI 
For commands inspect, ip, kill and restart.
It is already implemented for the others.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-14 02:09:08 +01:00
Guillaume Giamarchi 6c5da2bc0e Fix bug SSH interactive mode 
Commit b44db20 introduced a bug that broke
the SSH interactive mode. If no command is
provided, Driver.GetSSHCommand is called with
an empty string instead of no parameter.

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-13 18:46:52 +01:00
Evan Hazlett 909e69baff initial work on aws for machine; huge thanks to @nathanleclaire for the 
initial implementation

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-12 17:00:57 -05:00
Evan Hazlett 2435f265f2
fixes #94: url does not return active machine 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2014-12-12 15:40:30 -05:00
Simon Thulbourn b44db20335 implements a -c/--command flag for ssh 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:28:30 +00:00
Simon Thulbourn 0295e00edb makes the name optional for stop/start/ssh/upgrade 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:11:38 +00:00
Simon Thulbourn 64c73597e2 adds codegangsta/cli 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2014-12-12 18:11:17 +00:00
Guillaume Giamarchi d8921ee432 Move HostListItem from host.go to command.go 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 01:53:24 +01:00
Guillaume Giamarchi 8797ca2d50 Rename HostState struct to HostListItem 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 01:44:34 +01:00
Guillaume Giamarchi 1547a48dde Sort `machine ls` output by machine name 
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
 2014-12-12 00:39:08 +01:00
Ben Firshman dcf081d758 Check that public key exists when creating machine 
Fixes #4

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-06 20:54:41 +01:00
Ben Firshman b8ec7bf9a3 Fix command name in help text 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-06 20:33:42 +01:00
Ben Firshman ceec43ebcc Explain setting up Docker to run against machines 
Closes #14

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-05 13:58:26 +01:00
Ben Firshman 73d19108bf Initial commit 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-04 15:05:11 +01:00