Commit Graph

1649 Commits

Author SHA1 Message Date
10bab1af16 Merge pull request #31875 from toolchainX/patch-2
update service-create.md
(cherry picked from commit 0f1ee840143b230259544dbfc03205dafcd285ad)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8dd6f6d342
Component: cli
2017-06-02 00:10:58 +00:00
9989aea9fd Fix typo in sample output
Changed `ICONTAINER ID` to `CONTAINER ID`.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Upstream-commit: ea6ba69639
Component: cli
2017-06-02 00:10:58 +00:00
eb0bef3819 misleading default for --update-monitor duration
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: ffd24bd8e8
Component: cli
2017-06-02 00:10:58 +00:00
2049ccb8d4 Support --filter mode=global|replicated for docker service ls
This fix tries to address the request in 31325 by adding
`--filter mode=global|replicated` to `docker service ls`.

As `docker service ls` has a `MODE` column by default, it is natural
to support `--filter mode=global|replicated` for `docker service ls`.

There are multiple ways to address the issue. One way is to pass
the filter of mode to SwarmKit, another way is to process the filter
of mode in the daemon.

This fix process the filter in the daemon.

Related docs has been updated.

An integration test has been added.

This fix fixes 31325.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d43b0f1269
Component: cli
2017-06-02 00:10:58 +00:00
d857ffda7d docs: added support for CLI yaml file generation
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 6fe11272d3
Component: cli
2017-06-02 00:10:58 +00:00
e1322682e0 docs: remove outdated reference to updating /etc/hosts
Starting with docker 1.10, docker no longer uses
/etc/hosts for service discovery, but uses an
embedded DNS server. This patch removes a reference
to the old (pre 1.10) behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: afe91a5120
Component: cli
2017-06-02 00:10:58 +00:00
7c4a2f84cd Add --prune to stack deploy.
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 9888942fbc
Component: cli
2017-06-02 00:10:58 +00:00
7ef9528844 Remove docs for dockerd --no-new-privileges
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 48332a6aeb
Component: cli
2017-06-02 00:10:57 +00:00
03b30a9925 Enhance network inspect to show all tasks, local & non-local, in swarm mode
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
Upstream-commit: 84ccb00486
Component: cli
2017-06-02 00:10:57 +00:00
55f899c468 Fix markdown in references for Kramdown
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 1f531be8ab
Component: cli
2017-06-02 00:10:57 +00:00
224077d070 Fix directive example to match description
The description claims the directive is appearing after a comment but
the sample Dockerfile has the directive appear after an instruction.
Changed the ordering of the lines to match the example's description.

Signed-off-by: Remy Suen <remy.suen@gmail.com>
Upstream-commit: 558b8923ab
Component: cli
2017-06-02 00:10:57 +00:00
15aa8d05a4 Fix typo in run.md documentation
Signed-off-by: John Laswell <john.n.laswell@gmail.com>
Upstream-commit: beacad8f6c
Component: cli
2017-06-02 00:10:57 +00:00
bab7965433 Fix description of docker run|create --stop-signal in help message
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2fcb361c55
Component: cli
2017-06-02 00:10:57 +00:00
985040a0a9 added listing for Nimble Storage's volume plugin
Signed-off-by: Keith Hudgins <greenman@greenman.org>

updated nimble plugin url
Upstream-commit: 01468292d6
Component: cli
2017-06-02 00:10:57 +00:00
33d9e6294f Add support for rollback flags
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 33ae729456
Component: cli
2017-06-02 00:10:56 +00:00
43638de628 Add support for the "rollback" failure action
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 8271c2a624
Component: cli
2017-06-02 00:10:56 +00:00
951746da22 Topology-aware scheduling
This adds support for placement preferences in Swarm services.

- Convert PlacementPreferences between GRPC API and HTTP API
- Add --placement-pref, --placement-pref-add and --placement-pref-rm to CLI
- Add support for placement preferences in service inspect --pretty
- Add integration test

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0248b4df54
Component: cli
2017-06-02 00:10:56 +00:00
0d542318dc update deprecation dates
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
Upstream-commit: 04731761bc
Component: cli
2017-06-02 00:10:56 +00:00
4a9d19fc63 Update index.md
Signed-off-by: Wang Jie <wangjie5@chinaskycloud.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2c9f862eaf
Component: cli
2017-06-02 00:10:56 +00:00
fec035ef1b remove Jekyll tags from CLI reference
These Markdown files are now embedded in a YAML
file for templating in the documentation, and
these special markers are no longer needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 8e7dd976f8
Component: cli
2017-06-02 00:10:56 +00:00
ded0855252 Add --stop-signal for service create and service update
This fix tries to address the issue raised in 25696 where
it was not possible to specify `--stop-signal` for `docker service create`
and `docker service update`, in order to use special signal to stop
the container.

This fix adds `--stop-signal` and update the `StopSignal` in `Config`
through `service create` and `service update`.

Related docs has been updated.

Integration test has been added.

This fix fixes 25696.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: e9457714cf
Component: cli
2017-06-02 00:10:56 +00:00
03bbd2f84a Remove incorrect duplicate phrase from build.md
A phrase from the "Text files" section in build.md was incorrectly duplicated under the "Tarball contexts" section.

Signed-off-by: Peter Jaffe <pjaffe@nevo.com>
Upstream-commit: 3a9b35dfa4
Component: cli
2017-06-02 00:10:56 +00:00
bcb5191002 Service creation using network plugin filters.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: 93344b57f3
Component: cli
2017-06-02 00:10:56 +00:00
d9e38bf671 Add --add-host for docker build
Signed-off-by: Tony Abboud <tdabboud@hotmail.com>
Upstream-commit: 174d9f0097
Component: cli
2017-06-02 00:10:56 +00:00
1e8d9e0c5e Clarify why hosts in daemon.json does not work
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e66bc57039
Component: cli
2017-06-02 00:10:55 +00:00
dba622ebee Delete dots to align with other commands description
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 21f6dce0a0
Component: cli
2017-06-02 00:10:55 +00:00
a7d5248d4a [Docs] Add docs for stating stopped containers
This commit adds docs with example showing `docker stats` stopped
containers.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 12053f480b
Component: cli
2017-06-02 00:10:55 +00:00
2cc38cf538 fix the type
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 6f3f9e384c
Component: cli
2017-06-02 00:10:55 +00:00
6669309a99 add rollback explanation to docker service update command document
Signed-off-by: erxian <evelynhsu21@gmail.com>
Upstream-commit: 1869390de8
Component: cli
2017-06-02 00:10:55 +00:00
400bf05854 Add daemon flag to set no_new_priv as default for unprivileged containers.
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com>
Upstream-commit: 218740abc7
Component: cli
2017-06-02 00:10:55 +00:00
bc16584b47 Add --format to docker service ps
This fix tries to address the issue raised in 27189 where
it is not possible to support configured formatting stored in
config.json.

Since `--format` was not supported in `docker service ps`,
the flag `--format` has also been added in this fix.

This fix
1. Add `--format` to `docker service ps`
2. Add `tasksFormat` to config.json
3. Add `--format` to `docker stack ps`
4. Add `--format` to `docker node ps`

The related docs has been updated.

An integration test has been added.

This fix fixes 27189.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 1328bb4440
Component: cli
2017-06-02 00:10:55 +00:00
a1fc8b3905 Add example for --device-cgroup-rule to create reference
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: dd6886657d
Component: cli
2017-06-02 00:10:55 +00:00
4ddd044359 Fix some Liquid errors
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: f36bcf1acd
Component: cli
2017-06-02 00:10:55 +00:00
5c08d35278 Update plugin_volume apidocs for v2
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 38ac6860eb
Component: cli
2017-06-02 00:10:55 +00:00
be42fef480 Add plugin socket related debug docs.
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: ab7522c939
Component: cli
2017-06-02 00:10:55 +00:00
b62be1dbab Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: e6a4e7507c
Component: cli
2017-06-02 00:10:54 +00:00
0efa0b9b49 fix typo
Signed-off-by: yupengzte <yu.peng36@zte.com.cn>
Upstream-commit: 225c67f074
Component: cli
2017-06-02 00:10:54 +00:00
914cef8159 Add missing link in deprecated.md
This fix adds a missing link in deprecated.md
```
Deprecated In Release: [v1.13.0]...
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: ecc4938091
Component: cli
2017-06-02 00:10:54 +00:00
07b8086695 Define bridge networks
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 022d972c38
Component: cli
2017-06-02 00:10:54 +00:00
dde4ebbb22 add expose and publish filter in swagger.yml and CLI docs for docker/master
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 1507e86ada
Component: cli
2017-06-02 00:10:54 +00:00
714b8afe3a add missing filter type and sort filter type in alphabets
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4113925b25
Component: cli
2017-06-02 00:10:53 +00:00
020523b38b Standardized formatting of CLI reference commands
Command name should be a H1

Only Description, Examples, and Related Commands should be H2

Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands

Added some examples where relevant

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: ddadd3db49
Component: cli
2017-06-02 00:10:53 +00:00
a34431061a Removed unused image
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: cf4b3715ed
Component: cli
2017-06-02 00:10:53 +00:00
021a712fcb Add info about the relationship between swarm leave and node rm
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: c2893a6e1c
Component: cli
2017-06-02 00:10:53 +00:00
de4235c225 update events related doc and swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: d84da237bf
Component: cli
2017-06-02 00:10:53 +00:00
7805da2f23 Add plugin debug docs.
Doc fix for #30761

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
Upstream-commit: c76dcd33f7
Component: cli
2017-06-02 00:10:53 +00:00
fd7bb178af Remove --init-path mention
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: b380c2eb63
Component: cli
2017-06-02 00:10:53 +00:00
5a52b7e76e Document --init flag for docker run
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
Upstream-commit: f571b363e6
Component: cli
2017-06-02 00:10:53 +00:00
5842bb356f Fix grammatical error in swarm_leave.md
Correct this sentence so it reads correctly. "to on a manager" should be
"on a manager".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: e6889bf41b
Component: cli
2017-06-02 00:10:53 +00:00
a754ae967d Updated dockerd docs with note about user namespaces
Signed-off-by: Lewis Daly <lewisdaly@me.com>

Updated uid/gid reference to be more canonical - and signed commit

Signed-off-by: Lewis Daly <lewisdaly@me.com>

Editorial suggestion

I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.

Editorial suggestion

I tried my hand at rewriting this a bit for readability. Can you please verify that the facts are correct, especially about the permission changes? You can feel free to squash my commit with yours so that it's signed. You'll need to pull the change from your fork to work on it locally.
Upstream-commit: 50d1d4ecba
Component: cli
2017-06-02 00:10:52 +00:00