Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
DockerCLI/docs/reference/commandline
History
Sebastiaan van Stijn 231703c3c6 Improve swarm join-token instructions 
this change improves the instructions for
swarm join-token and swarm init;

- only print the join-token command for workers
  instead of for both managers and workers, to
  prevent users from copying the wrong command.
  An extra line is added to explain how to obtain
  the manager token.
- print a message that a token was rotated
  sucesfully if '--rotate' is used.
- add some extra white-space before / after
  the join commands, to make copy/pasting
  easier.

this change also does some refactoring of join-token;

- move flagname-constants together with other constants
- use variables for selected role ("worker" / "manager")
  to prevent checking for them multiple times, and to
  keep the "worker" / "manager" sting centralized
- add an extra blank line after "join-token" instructions
  this makes it easier to copy, and cleans up the
  code a tiny bit

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 		2017-06-02 00:10:03 +00:00
..
attach.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
build.md docs: add code-hints to builder page 2017-06-02 00:10:01 +00:00
cli.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
commit.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
cp.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
create.md Improve flag help consistency, and update docs 2017-06-02 00:07:51 +00:00
deploy.md Append --registry-auth with with 2017-06-02 00:10:02 +00:00
diff.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
docker_images.gif retooling for hugo 2017-06-02 00:06:58 +00:00
dockerd.md add doc for live-restore setting and daemonless containers, fix admin guide menu 2017-06-02 00:10:03 +00:00
events.md Make daemon events listen for plugin lifecycle events. 2017-06-02 00:10:03 +00:00
exec.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
export.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
history.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
images.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
import.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
index.md update command description in CLI 2017-06-02 00:10:03 +00:00
info.md Update usage of "Swarm" for consistency 2017-06-02 00:10:03 +00:00
inspect.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
kill.md update command description in CLI 2017-06-02 00:10:03 +00:00
load.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
login.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
logout.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
logs.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
menu.md add menu.md, make index.md command line reference, update typos/minor errors in cli docs 2017-06-02 00:07:47 +00:00
network_connect.md Rename `--net` to `--network` 2017-06-02 00:07:50 +00:00
network_create.md better command `docker network create -h` output 2017-06-02 00:07:51 +00:00
network_disconnect.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
network_inspect.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
network_ls.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
network_rm.md update command description in CLI 2017-06-02 00:10:03 +00:00
node_demote.md update command description in CLI 2017-06-02 00:10:03 +00:00
node_inspect.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
node_ls.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
node_promote.md update command description in CLI 2017-06-02 00:10:03 +00:00
node_ps.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
node_rm.md update command description in CLI 2017-06-02 00:10:03 +00:00
node_update.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
pause.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
plugin_disable.md docs: update reference docs for plugins 2017-06-02 00:10:01 +00:00
plugin_enable.md docs: update reference docs for plugins 2017-06-02 00:10:01 +00:00
plugin_inspect.md docs: update reference docs for plugins 2017-06-02 00:10:01 +00:00
plugin_install.md docs: update reference docs for plugins 2017-06-02 00:10:01 +00:00
plugin_ls.md docs: update reference docs for plugins 2017-06-02 00:10:01 +00:00
plugin_rm.md docs: fix copy/pasta error 2017-06-02 00:10:01 +00:00
port.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
ps.md docs: improve formatting and highlighting of docker ps reference 2017-06-02 00:10:01 +00:00
pull.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
push.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
rename.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
restart.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
rm.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
rmi.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
run.md Improve flag help consistency, and update docs 2017-06-02 00:07:51 +00:00
save.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
search.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
service_create.md Update docs in `docker service create/update` for flag `--user` 2017-06-02 00:10:03 +00:00
service_inspect.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
service_ls.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
service_ps.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
service_rm.md update command description in CLI 2017-06-02 00:10:03 +00:00
service_scale.md cli: `docker service|node|stack ps` instead of tasks 2017-06-02 00:10:03 +00:00
service_update.md Update docs in `docker service create/update` for flag `--user` 2017-06-02 00:10:03 +00:00
stack_config.md docs: add initial reference for "stack services" 2017-06-02 00:10:01 +00:00
stack_deploy.md docs: add initial reference for "stack services" 2017-06-02 00:10:01 +00:00
stack_rm.md docs: add initial reference for "stack services" 2017-06-02 00:10:01 +00:00
stack_services.md docs: add initial reference for "stack services" 2017-06-02 00:10:01 +00:00
stack_tasks.md docs: add initial reference for "stack services" 2017-06-02 00:10:01 +00:00
start.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
stats.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
stop.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
swarm_init.md Improve swarm join-token instructions 2017-06-02 00:10:03 +00:00
swarm_join.md Remove release-candidate advisories 2017-06-02 00:10:03 +00:00
swarm_join_token.md Improve swarm join-token instructions 2017-06-02 00:10:03 +00:00
swarm_leave.md Remove release-candidate advisories 2017-06-02 00:10:03 +00:00
swarm_update.md Update usage of "Swarm" for consistency 2017-06-02 00:10:03 +00:00
tag.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
top.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
unpause.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
update.md Fix kernel memory updating docs 2017-06-02 00:10:03 +00:00
version.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
volume_create.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
volume_inspect.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
volume_ls.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00
volume_rm.md update command description in CLI 2017-06-02 00:10:03 +00:00
wait.md Updates on cli reference documentation 2017-06-02 00:07:49 +00:00