Commit Graph

4045 Commits

Author SHA1 Message Date
d5cbd105be bump version to 17.06.1-ce-rc2
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
2017-07-26 16:51:15 -07:00
eafd4433aa Merge pull request #133 from thaJeztah/cli-docs-cherry-picks
[17.06] CLI reference docs cherry-picks (and 1 completion fix)
2017-07-26 16:18:23 -07:00
a0a268737c fixed word network on volume_ls.md
Signed-off-by: Hernan Garcia <hernandanielg@gmail.com>
(cherry picked from commit f5bca7af10)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 03:07:23 +02:00
114d979f77 Remove duplicate publish option in docker service create/update completion
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
(cherry picked from commit 6c65ba6c08)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:54:40 +02:00
7ee46d779c Update __docker_get_log_options completion
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
(cherry picked from commit d7ade64d29)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:54 +02:00
26ace597a5 Add zsh completion for system prune --volumes
Signed-off-by: Jean-Pierre Huynh <jean-pierre.huynh@ounet.fr>
(cherry picked from commit 6b256484ae)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:47 +02:00
7fd4d9d5aa Improve bash completion for service create|update --detach
bash completion usually completes boolean options that default to `true`
with the `=false` suffix because that is the only syntax that really
changes behavior.
For this option, I implemented completion falsely.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit fc0dafbbd1)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:40 +02:00
caf6943211 Refactor alias delegation in bash completion for secret rm|remove
The completion logic should be implemented in the documented subcommands
(ls, rm) and delegated to from the aliases (list, remove).
For the rm|remove pair, this was implemented vice versa.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit d585e554d5)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:33 +02:00
02a80c5c3c Add bash completion for secret inspect --pretty
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 211bd55ae7)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:27 +02:00
1c82e267a7 Add bash completion for docker config command family
This adds bash completion for
- https://github.com/docker/cli/pull/45
- https://github.com/moby/moby/pull/32336

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit c40952b305)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:19 +02:00
1828a8bff1 Add metric plugins to bash completion for plugin ls --filter capability
This adds bash completion for https://github.com/moby/moby/pull/32874.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 2caf425f02)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:12 +02:00
b7693dda2d Add bash completion for awslogs multiline log driver options
This adds bash completion for https://github.com/moby/moby/pull/30891.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 1d21a3dd7c)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:52:05 +02:00
15acd33ef6 Add bash completion for build --iidfile
This adds bash completion for https://github.com/moby/moby/pull/32406.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 1f8720717d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:51:56 +02:00
f2332481a7 Add bash completion for system prune --volumes
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 36b572dfdf)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:51:48 +02:00
c2b2ea1702 Service privileges: CLI reference docs & completion
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 5cc7ac2990)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:42 +02:00
068aa8ed63 More about ARG and build stages.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit ad5d035988)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:34 +02:00
9f144cca26 Clarify docs about ARG in FROM
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 2880030814)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:26 +02:00
bf1f505a77 Fix filters displaying for docker search
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit bd64ad25fb)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:18 +02:00
0cd4fd721d docs: add filter scope for command events and more cluster events
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 8639c9baf8)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:07 +02:00
860f79a6d4 Fix typo (proceed -> precede)
Signed-off-by: Valentin Lorentz <progval+git@progval.net>
(cherry picked from commit 4f3a8aecad)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:35:00 +02:00
7f0cfc1090 Update the cp command docs to include archive
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
(cherry picked from commit e4c70d390d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2017-07-25 02:34:51 +02:00
c257617b99 Merge pull request #118 from andrewhsu/rc1
bump version to 17.06.1-ce-rc1
2017-07-13 16:03:01 -07:00
1d1b9ad4db Merge pull request #115 from andrewhsu/set-ping-ver
[17.06] Set ping version even on error
2017-07-13 11:59:16 -07:00
ab734f59cc Merge pull request #105 from andrewhsu/backport-doc-fixes
[17.06] backport various docs fixes
2017-07-13 11:54:25 -07:00
3c4292da1e vendor prev git commit 10aa812 into components/cli
Originally from commit titled: Set ping version even on error
which was cherry picked from upstream commit 27ef09a of component engine.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-13 04:10:32 +00:00
9795a158bd Merge pull request #110 from andrewhsu/fix-swarm-warn
[17.06] backport (cli) If `docker swarm ca` is not called with the `--rotate` flag, warn if other flags are passed
2017-07-12 19:01:59 -07:00
3d947e7a2d Fix warning in docker CLI when swarm ca --ca-cert, etc. flags are passed,
and add a test.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 4615c92f66)

Conflicts:
components/cli/cli/command/swarm/ca_test.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-13 00:25:00 +00:00
cb9b544edf Merge pull request #107 from andrewhsu/fix-service-spec
[17.06] backport "Do not add duplicate platform information to service spec"
2017-07-12 10:35:50 -07:00
1e1c6b20ef Merge pull request #109 from andrewhsu/dont-prune-vol
[17.06] backport (cli) Don't prune volumes on docker system prune
2017-07-12 09:11:43 +02:00
abfc72adff Merge pull request #92 from andrewhsu/fix-relabel
[17.06] Do not error on relabel when relabel not supported
2017-07-11 21:29:47 -07:00
068a4285c6 Merge pull request #106 from andrewhsu/fix-wait-hang
[17.06] Docker wait hangs indefinitely for non-existent container (vendor)
2017-07-11 19:06:58 -07:00
4ff004bf0d Do not error on relabel when relabel not supported
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit ebfdfc5768b74e0a52875cf76a0576bfcd66445c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 01:17:55 +00:00
8cf887b304 Remove bash completion for service update --network
The `--network` option is only available for `docker service create`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e7e77b5e65)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:48:22 +00:00
5b4a4cc549 Fix bash completion for swarm init|join --data-path-addr
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit fa4dc8820a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
8e17167c78 Add bash completion for swarm ca
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 5bd00a563e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
fd95ab90ad Add bash completion for service create|update --network-(add|rm)
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit fa0f470a5f)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
8498135904 Add bash completion for service create|update (update|rollback)-order
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 71dd0e0b66)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
15c737a076 Add bash completion for plugin events
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit f0f7150537)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
c1383568b1 Add bash completion for service create --detach
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8baef1098e)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
3d418e35c9 Fix bash completion for network create --internal
`--internal` is a boolean option. It was falsely treated as non-boolean.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 12dc9eb11f)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
1c96c7a5ec Add bash completion for network create --scope|--config-only|config-from
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 22579ba56c)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
224f23149e Add bash completion for service create|update --entrypoint
Also fixes a wrong option: `--arg` should be `--args`.

Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e0462e8472)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
8f5b746fdd Add bash completion for label filter of prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 8b99b65ca8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
9f5039a8d0 Add bash completion for network create --ingress
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit e4f9ad77c8)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-12 00:47:36 +00:00
482d9bdee0 If docker swarm ca is not called with the --rotate flag, the other
flags, including cert expiry, will be ignored, so warn if a user attempts
to use `docker swarm ca --cert-expiry` or something.

Signed-off-by: Ying Li <ying.li@docker.com>
(cherry picked from commit 32b43bc21a)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 23:06:39 +00:00
f6b5934f71 Remove deadlock in ContainerWait
when `cli.post(...)` fails `errC <- err` blocks because `errC` is unbufferd.

Signed-off-by: Simon Menke <simon.menke@gmail.com>
(cherry picked from commit 4d2d2ea39336aade783c5c415b83d129bdd339bb)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 23:04:40 +00:00
38f7bacec2 Merge pull request #97 from andrewhsu/fix-progress
[17.06] progress: Show progress of replicated tasks before they are assigned
2017-07-11 15:56:39 -07:00
f7a9f9fb67 system prune: only warn about volumes if --volumes is given
Signed-off-by: Harald Albers <github@albersweb.de>(cherry picked from commit 849b0e96a0)

Conflicts:
components/cli/cli/command/system/prune.go
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 05:45:51 +00:00
647b4aecce Don't prune volumes on docker system prune
Volumes tend to carry important data and pruning them on `docker system
prune` can easily cause unwanted data loss.

Let's play it safe and not prune volumes on `system prune` by default,
and instead provide an option.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 37fd6128dc)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 05:42:58 +00:00
056540a3f1 Do not add duplicate platform information to service spec
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
(cherry picked from commit da85b62001ec390bdc30b321c4a5cd23c17eeb81)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 05:06:28 +00:00