Commit Graph

760 Commits

Author SHA1 Message Date
081f2ffa6c Merge pull request #28259 from sdurrheimer/zsh-completion-node-rm-swarm-leave-force
Add zsh completion for 'docker {node rm,swarm leave} -f'
Upstream-commit: b24a833f816ecd59fa733c94657efe56fd913777
Component: engine
2016-11-10 21:52:18 +01:00
b550de0a42 Merge pull request #28255 from sdurrheimer/zsh-completion-dockerd-seccomp-profile
Add zsh completion for 'docker daemon --seccomp-profile'
Upstream-commit: 93591faeb5bcf3e31ce65dfa58e825f72c6e5489
Component: engine
2016-11-10 21:51:29 +01:00
6b9d29433b Merge pull request #28256 from sdurrheimer/zsh-completion-service-create-update-tty
Add zsh completion for 'docker service {create,update} --tty'
Upstream-commit: 8aa04807adcc26bd6dea26c9a1ce284c73d175b7
Component: engine
2016-11-10 21:50:29 +01:00
1193760855 Merge pull request #28252 from sdurrheimer/zsh-completion-service-create-hostname
Add zsh completion for 'docker service create --hostname'
Upstream-commit: c51b16f0e4081d1270cfe28887f87a0d5a5a6859
Component: engine
2016-11-10 21:49:02 +01:00
6ff10b10a9 Add zsh completion for 'docker {node rm,swarm leave} -f'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 04e7fca6203287fbf2790acb4886af46f188543e
Component: engine
2016-11-10 21:31:34 +01:00
b67d7eab26 Add zsh completion for 'docker service {create,update} --tty'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a34a41b20b9b5849ddd316b11935c6c2754fd253
Component: engine
2016-11-10 21:25:24 +01:00
6ecbb91f43 Add zsh completion for 'docker daemon --seccomp-profile'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0f324a5b154baeafef730f62d779da14c54ef8db
Component: engine
2016-11-10 21:21:25 +01:00
5c80e344d2 Merge pull request #28254 from sdurrheimer/zsh-completion-container-create-run-cpus
Add zsh completion for 'docker {run,create} --cpus'
Upstream-commit: a851cad25cd45b6d7f528210b6800ebb90d0866f
Component: engine
2016-11-10 15:16:19 -05:00
84c24899c1 Add zsh completion for 'docker {run,create} --cpus'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 9b02c87f7bcb49396258e45c0487dce4a94661fc
Component: engine
2016-11-10 21:10:22 +01:00
32e8919fe3 Add zsh completion for 'docker service create --hostname'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: ca654a417a27f72edc99e02d75d9602a9698f6e3
Component: engine
2016-11-10 21:00:17 +01:00
fb791c891a Add zsh completion for new prune commands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 712445607d5c5e03ea39bd9c6403104565a0d342
Component: engine
2016-11-10 20:51:44 +01:00
3c72f5dda6 Add zsh completion for 'docker system' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 9df7cdcb2e6e169e0d41458bf86e02203a4fe0cd
Component: engine
2016-11-10 20:17:58 +01:00
8bb2169ed5 Merge pull request #28186 from yongtang/27567-follow-up-dns-options
Add `--dns-option` to `docker run` and hide `--dns-opt`
Upstream-commit: 33af4dd505aac709d607d26fc19a16d3dffdd66e
Component: engine
2016-11-10 16:20:17 +01:00
a8a11f6c62 Add --dns-option to docker run and hide --dns-opt
This fix is a follow up to #27567 based on:
https://github.com/docker/docker/pull/27567#issuecomment-259295055

In #27567, `--dns-options` has been added to `service create/update`,
together with `--dns` and `--dns-search`. The `--dns-opt` was used
in `docker run`.

This fix add `--dns-option` (not `--dns-options`) to `docker run/create`, and hide
`--dns-opt`. It is still possible to use `--dns-opt` with
`docker run/create`, though it will not show up in help output.

This fix change `--dns-options`to --dns-option` for `docker service create`
and `docker service update`.

This fix also updates the docs and bash/zsh completion scripts.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 9b6b3c2076911ea0a510548943180ac9d1b8c286
Component: engine
2016-11-09 12:13:25 -08:00
df5a4e64bf Add bash completion for docker {node rm,swarm leave} -f
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cc0c14aab72ce3377d9cfa02cfc05f262d99ecd7
Component: engine
2016-11-09 11:42:18 -08:00
15aa5ee667 Merge pull request #28197 from sdurrheimer/zsh-completion-image-subcommand
Add zsh completion for new 'docker image' subcommands
Upstream-commit: 51254847203ffa1df2f53950278d478b9cc38b0f
Component: engine
2016-11-09 10:30:55 -05:00
0d2e6f9d94 Cleanup after moving all zsh completion logics for the new image command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 29367c7e684d1178612b36dcc550c354bf15b68d
Component: engine
2016-11-09 08:15:25 +01:00
2477845c35 Move zsh completion logic to new subcommand: tag
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cc879af088f6172f7b94fcfb94ef18716cd0c79f
Component: engine
2016-11-09 08:15:23 +01:00
cfdb60cb73 Move zsh completion logic to new subcommand: save
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d2af96342dcbc36dda58a1d1aeaa24072c7a8ee8
Component: engine
2016-11-09 08:15:22 +01:00
b343bd70e1 Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: e5c98f3887b1b6e2a0deb11bc5d371d5300ca2aa
Component: engine
2016-11-09 08:15:20 +01:00
733d81aad9 Move zsh completion logic to new subcommand: push
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 17cdc95a199aa8543aaa90359aa461ad5bf4240d
Component: engine
2016-11-09 08:15:18 +01:00
1edb788a77 Move zsh completion logic to new subcommand: pull
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 102742a3cdc3633c8adb28f4f6cccd5028b46039
Component: engine
2016-11-09 08:15:16 +01:00
5f05123095 Move zsh completion logic to new subcommand: ls
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c333821334db2c8c1d8e4af73176ec8cdefe4643
Component: engine
2016-11-09 08:15:14 +01:00
58ef25601e Move zsh completion logic to new subcommand: load
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: c308befdc0f8afa21c0ee7048cec1e5eca9c8da0
Component: engine
2016-11-09 08:15:13 +01:00
572723e3ba Add zsh completion logic to new subcommand: inspect
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d0014299b420191ceef627ed8dda809914b9ff4c
Component: engine
2016-11-09 08:15:11 +01:00
d6334ea62f Move zsh completion logic to new subcommand: import
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: a4656e46f77c11aa27fa8e1f37398ea9b8c4738c
Component: engine
2016-11-09 08:15:10 +01:00
0144aba2f6 Move zsh completion logic to new subcommand: history
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2014e787309d3eb1fcf26ffd324deef2c2177d7a
Component: engine
2016-11-09 08:15:08 +01:00
34207fe9ff Move zsh completion logic to new subcommand: build
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d3305a17e11233451ed79cb6f2f0f6c8a9b03b94
Component: engine
2016-11-09 08:15:07 +01:00
4e97cf792b Add zsh completion for 'docker image' subcommands
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53a56990c43985f1bacc0c87d92e7cb7743475ae
Component: engine
2016-11-09 08:15:05 +01:00
d0a8f76683 Rename zsh images & log complete functions
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 2a44da973200258cf80fb9693a4e84211ee3a3d9
Component: engine
2016-11-09 08:14:40 +01:00
f7b4103706 cli: Add options for Raft snapshotting
Add the following options to "swarm init" and "swarm update":

- --max-snapshots: Retain this many old Raft snapshots in addition
  to the latest one

- --snapshot-interval: Number of log entries between Raft snapshots

These options already existed in SwarmKit and the Docker API but were
never exposed in the CLI. I'm adding them here to fix this oversight.

--max-snapshots may be useful for debugging purposes and more
conservative users who want to store rolling backups of old versions of
the Raft state.

--snapshot-interval is most useful for performance tuning. The default
value of 10000 may not be ideal for some setups.

There is also a LogEntriesForSlowFollowers option that is not exposed. I
decided not to expose it along with these others because I don't think
it's generally useful (and I'm not sure what I would call the CLI flag).
But if people want, I can expose it for the sake of completeness.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 842d11f44cede2d7e9488e54f8ac8de89d8f4cd4
Component: engine
2016-11-08 13:14:01 -08:00
379e810a82 Merge pull request #27888 from sdurrheimer/zsh-completion-container-subcommand
Add zsh completion for new 'docker container' subcommands
Upstream-commit: d46c7109b520bfe485b4c9ca5f59a3768b444aa0
Component: engine
2016-11-08 11:24:28 +01:00
08efaac2fe Add bash completion for docker service {create,update} --tty
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: bfd8f7a7e15a0a4eece33e545368e915470147e0
Component: engine
2016-11-08 09:13:23 +01:00
9156f6f7cf Merge pull request #28093 from albers/completion-run--cpus
Add bash completion for `docker {run,create} --cpus`
Upstream-commit: de78ed432ba526ca463d191e3ac143bc107c00f5
Component: engine
2016-11-07 17:31:40 +09:00
a76d4f99db Merge pull request #28094 from albers/completion-system-df
Add bash completion for `docker system df`
Upstream-commit: 67a247154c60ef924ca41a57f4720d4b9f3a5f65
Component: engine
2016-11-07 17:31:27 +09:00
cd10215557 Merge pull request #28096 from albers/completion-prune
Add bash completion for new prune commands
Upstream-commit: afb1119c851c5da7b85bc5d51f9d642113f994a5
Component: engine
2016-11-07 09:30:56 +01:00
e3849dda91 Fix bash completion for docker inspect --type
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d65934a8b85b961b95fcb1443f2191bef23df17b
Component: engine
2016-11-05 11:22:47 -07:00
f51ce2d41b Add bash completion for new prune commands
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 8099280cd81bf1e6e0cbaf8a3ba728ec1ccb1d50
Component: engine
2016-11-05 10:39:33 -07:00
e6605af98d Add bash completion for docker system df
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 09172051fc90c55bb06359b60918d15feb9aecc4
Component: engine
2016-11-05 10:12:35 -07:00
4a58c855ef Add bash completion for docker {run,create} --cpus
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9268bbaeeaebe68a5ccd2f32277059e80aac2d8c
Component: engine
2016-11-05 09:59:55 -07:00
889abdab10 Add bash completion for docker service create --hostname
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
217225ece0 Cleanup after moving all zsh completion logics for the new container command
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 94863d8c63dbdb811afba20b79d0502903fdd313
Component: engine
2016-11-04 08:55:16 +01:00
5f2dda8fc5 Move zsh completion logic to new subcommand: wait
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6a662de9650c19d8ada575badee4a5e4f3290e5d
Component: engine
2016-11-04 08:55:13 +01:00
6ffd295baf Move zsh completion logic to new subcommand: update
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b25603391c3ed562d136aa0eafcd7b35ff6c686a
Component: engine
2016-11-04 08:55:12 +01:00
a02dd8aa90 Move zsh completion logic to new subcommand: top
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 07a3ccec0a677aa198afa8b407f75c48cebd033a
Component: engine
2016-11-04 08:55:10 +01:00
0dca92ce6c Move zsh completion logic to new subcommand: stop
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6aff1be4303aff902a1997a300d910a6bfd19445
Component: engine
2016-11-04 08:55:09 +01:00
09263a74a2 Move zsh completion logic to new subcommand: stats
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d0e4f7fbe69d189a39a2c35584aee12dfe1cec2f
Component: engine
2016-11-04 08:55:07 +01:00
f0856717ce Move zsh completion logic to new subcommand: start
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 8e5285c283ac352702689a652eab13ba93d4bb41
Component: engine
2016-11-04 08:55:05 +01:00
413c4301a9 Move zsh completion logic to new subcommand: run
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: dcc5b72020382d2b379c26d25d6e173609e1c2fc
Component: engine
2016-11-04 08:55:04 +01:00
78134a2469 Move zsh completion logic to new subcommand: rm
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1df32a4f6c3160a6bbe7ab5a36be6e10ea51616f
Component: engine
2016-11-04 08:55:02 +01:00