Andrew Hsu
87a7a648df
Merge pull request #165 from andrewhsu/ln2
...
re-vndr engine's libnetwork to bump_17.06.0 again
2017-08-02 18:16:09 -07:00
Andrew Hsu
2a1db025ff
re-vndr components/cli/vendor/github.com/docker/docker from
...
components/engine
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
2017-08-02 17:26:39 -07:00
Alex Mavrogiannis
07c249a12a
Skip inspects of built-in networks on stack deploy
...
(cherry picked from commit 7f53c99dfe )
Signed-off-by: Alex Mavrogiannis <alex.mavrogiannis@docker.com >
2017-08-02 14:50:39 -07:00
Andrew Hsu
9df8f75ba9
Merge pull request #160 from seemethere/increment_170601rc3
...
[17.06.1] bump version to 17.06.1-ce-rc3
2017-08-02 09:43:05 -07:00
Andrew Hsu
1282b9439c
Merge pull request #148 from tiborvass/fix-vendor
...
Add top-level `make vendor` and run it.
2017-08-02 00:16:10 -07:00
Eli Uriegas
7d230371d9
bump version to 17.06.1-ce-rc3
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
2017-08-01 17:02:12 -07:00
Sebastiaan van Stijn
ac0d111d0e
Error if "until" filter is combined with "--volumes" on system prune
...
The "until" filter is supported by all object types, except for
volumes.
Before this patch, the "until" filter would attempted to be used for the volume
prune endpoint, resulting in an error being returned by the daemon, and
further prune endpoints (networks, images) to be skipped.
$ docker system prune --filter until=24h --filter label=label.foo=bar
WARNING! This will remove:
- all stopped containers
- all volumes not used by at least one container
- all networks not used by at least one container
- all dangling images
Are you sure you want to continue? [y/N] y
Error response from daemon: Invalid filter 'until'
Calling POST /v1.30/containers/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
Calling POST /v1.30/volumes/prune?filters=%7B%22label%22%3A%7B%22label.foo%3D%3Dbar%22%3Atrue%7D%2C%22until%22%3A%7B%2224h%22%3Atrue%7D%7D
Handler for POST /v1.30/volumes/prune returned error: Invalid filter 'until'
Error response from daemon: Invalid filter 'until'
With this patch, an error is produced instead, preventing "partial" prune.
$ docker system prune --filter until=24h --filter label=foo==bar --volumes
ERROR: The "until" filter is not supported with "--volumes"
Note that `docker volume prune` does not have this problem, and produces an
error if the `until` filter is used;
$ docker volume prune --filter until=24h
WARNING! This will remove all volumes not used by at least one container.
Are you sure you want to continue? [y/N] y
Error response from daemon: Invalid filter 'until'
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
(cherry picked from commit 3c095dc546 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2017-08-01 16:13:54 +02:00
Tibor Vass
ea04a0dd40
Run 'make vendor' to sync cli's vendored code with engine
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2017-07-27 03:07:38 +00:00
Eli Uriegas
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
Victor Vieux
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
Hernan Garcia
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
Jean-Pierre Huynh
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
Jean-Pierre Huynh
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
Jean-Pierre Huynh
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Sebastiaan van Stijn
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
Daniel Nephin
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
Daniel Nephin
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
yuexiao-wang
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
allencloud
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
Valentin Lorentz
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
Boaz Shuster
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
Andrew Hsu
c257617b99
Merge pull request #118 from andrewhsu/rc1
...
bump version to 17.06.1-ce-rc1
2017-07-13 16:03:01 -07:00
Andrew Hsu
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
Andrew Hsu
ab734f59cc
Merge pull request #105 from andrewhsu/backport-doc-fixes
...
[17.06] backport various docs fixes
2017-07-13 11:54:25 -07:00
Andrew Hsu
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
Andrew Hsu
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
Ying Li
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
Andrew Hsu
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
Kenfe-Mickaël Laventure
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
Andrew Hsu
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
Andrew Hsu
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
Brian Goff
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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
Harald Albers
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