Commit Graph

4029 Commits

Author SHA1 Message Date
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
b237329009 Clarify that you can use -d and --rm together now
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit c63485b47d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
7c374afda6 Provide examples for multiple uses of the same flag
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ef61582591)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
d4fe7965d2 Some builder docs improvements
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 29b419eed5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
ee07daead1 Fix false Liquid errors
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 11c1729e00)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
84d2a56ff3 Remove specific config info about userns-remap
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 8222baf263)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
e3d07855d5 Fix small typo
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit ede69a38c2)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:36 +00:00
1d69626e30 Reformat filtering options in ps ref
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0888df3058)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
1c48508832 Explain stack deploy with multiple Compose files
The Docker Compose docs suggest using a separate override
configuration file for production-specific settings, but
it is not obvious how to feed this to `docker stack deploy`,
which only supports a single Compose file as input. Thus,
we now describe how to do this by merging the configuration
files with `docker-compose config`.

Signed-off-by: Denis Washington <denis@denisw.de>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 36fa4af30b)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
345e74062e Fix Markdown formatting of experimental "stacks"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c5301ca35d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
6a52ac6c49 Added usage example for -e for exec
Signed-off-by: Vishnu Narayanan <iamwishnu@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit c848d9b22d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
b0d4910c7e docs/reference/builder.md: mention that USER directive also allows to specify the user group.
Signed-off-by: Slava Semushin <semushin@redhat.com>
(cherry picked from commit a84463d8d5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
73badb5bc7 Clarify ability to attach multiple times
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit b5d33c6e76)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-11 03:50:35 +00:00
f9cb0563ec progress: Show progress of replicated tasks before they are assigned
This was only showing tasks that belong to nodes that are currently up,
so that tasks on down nodes don't appear to be stuck. But this
unintentionally excludes tasks that haven't been assigned yet, so if a
task is stuck before assignment, for example because no nodes meet its
constraints, a progress bar won't even be shown. The check should only
apply to tasks that have a node assignment.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit d3d09f67b1)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-04 06:21:25 +00:00
9f64b19d32 Update docs, completion scripts for disable-legacy-registry
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 2b8f0eef7338f37104464154ba65aef7db3b9703)
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit ee1bbab620)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-04 06:06:15 +00:00
8be8aabad2 Merge pull request #33572 from hsluoyz/patch-1
Add Casbin plugin to the list of Authorization plugins in docs.
(cherry picked from commit 220831d541bfe9bf566c1038773198d431560dd3)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 0ad3e3294e74f443130b5e1fb1ef6b31f4f92366)
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 8b11d46ecd)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-04 06:06:15 +00:00
db292393e5 Update deprecated.md for removal of --email flag
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 43239f62bedc4721d27744d21c122622988bb3ae)
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 6ee8cf85c5)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-07-04 06:06:15 +00:00