Commit Graph

1149 Commits

Author SHA1 Message Date
4980c17b3e Add some helper text for magical ADD
Closes: #15777

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: fc57c3a419
Component: cli
2017-06-02 00:07:25 +00:00
d714ffc62b Fixing missing certs article; consolidating security material
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 32e9c9434a
Component: cli
2017-06-02 00:07:25 +00:00
d58b556f06 Make TLSOptions and LogConfig embedded structs.
That way the configuration file becomes flag, without extra keys.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 2ac86ababf
Component: cli
2017-06-02 00:07:25 +00:00
e50b50b8db Verify that the configuration keys in the file are valid.
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9930f31f74
Component: cli
2017-06-02 00:07:25 +00:00
85afde8f54 fixed typo
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
Upstream-commit: b1fbfa3b04
Component: cli
2017-06-02 00:07:25 +00:00
c1658a5a29 Added dead to docs for docker ps -f status=...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.

Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
Upstream-commit: e62e6e8b07
Component: cli
2017-06-02 00:07:25 +00:00
bff99821a5 Refactor handling of key specific subcompletions
The currently used idiom for handling key specific subcompletions
did not work here: behind `docker event -f type=network `, the completion
of networks triggered. The expected behaviour is not to complete
anything here.

In order to limit the scope of the corresponding PR, the new idiom is
currently only used in `docker events --filter`.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 869890dfbd
Component: cli
2017-06-02 00:07:25 +00:00
8e4ce2fbca Support new events in bash completion
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4e97e95cd8
Component: cli
2017-06-02 00:07:25 +00:00
e138f9a8f1 Fixed typo in "/etc/subUid"
Signed-off-by: Azat Khuziyakhmetov <shadow_uz@mail.ru>
Upstream-commit: 7e208ef5d0
Component: cli
2017-06-02 00:07:25 +00:00
03beec76f7 Fix comment about swap limit of docker update
The description "set `-1` to disable swap" is wrong, `build`,
`create` and `run` already fixed, we need to fix `update` as well.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: dd7ea45fae
Component: cli
2017-06-02 00:07:25 +00:00
4d93fd5be9 Refine the volume mount example
The path here should be absolute, else it would
deem it as volume name.

Also link to release page to contain static binary,
the old link not work, because it is just used to
install docker in os distro, it can not be used
as static binary directly.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 6c5013bc3c
Component: cli
2017-06-02 00:07:25 +00:00
f38d61744d Fix the typo in ps
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 35f4d67cfd
Component: cli
2017-06-02 00:07:25 +00:00
f7115b4f9c Fix the ulimit link
The old link not existed, we need fix it the right one.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 931232313c
Component: cli
2017-06-02 00:07:25 +00:00
7f51425d12 Fix commit wrong repository example
The old name is invalid in new repository name spec.
So we need to fix them.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 4ed29cad62
Component: cli
2017-06-02 00:07:25 +00:00
9ff6318b21 Add zsh completion for 'docker network connect --link'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: cc1695f363
Component: cli
2017-06-02 00:07:25 +00:00
50f0de6561 Add zsh completion for 'docker {network connect, create, run} --ip --ip6'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 0c21ceac7e
Component: cli
2017-06-02 00:07:25 +00:00
2faed079b3 Add zsh completion for 'docker network connect --alias' and 'docker {create, run} --net-alias'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: b3b3392c97
Component: cli
2017-06-02 00:07:25 +00:00
e0b22a0cfd Add zsh completion for 'docker {attach,exec,run,start} --detach-keys'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 19f41be56b
Component: cli
2017-06-02 00:07:24 +00:00
4869557d7c Add zsh completion for 'docker network create --ipam-opt' + Reordering for better maintainability
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7fe9c72a37
Component: cli
2017-06-02 00:07:24 +00:00
bcf3fbd598 Fix ulimit command form
The ulimit is builtin, so we need shell form to execute it.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 135fb7a665
Component: cli
2017-06-02 00:07:24 +00:00
f2921f48fb Fix add host device example
The example is not right in parameter, and also
one command is same as first one, it should be typo
before, we should use 'rw' as example for that.

Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 1af502f23d
Component: cli
2017-06-02 00:07:24 +00:00
3d871c06a7 Fix the privileged example
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 77ff4c9b7f
Component: cli
2017-06-02 00:07:24 +00:00
3a19e416a5 bash completion for container linking and aliasing
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 16c9a72852
Component: cli
2017-06-02 00:07:24 +00:00
bd29bc3d11 bash completion for docker network create --internal, --ipam-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 09809fe27e
Component: cli
2017-06-02 00:07:24 +00:00
7bb92bc7e2 Add zsh completion for 'docker network create --internal'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 6d32fd8763
Component: cli
2017-06-02 00:07:24 +00:00
a16f13f89f Modify zsh completion for connecting/disconnecting non-running containers to networks
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 78f33c4c2b
Component: cli
2017-06-02 00:07:24 +00:00
063315c429 Fixed typo in experimental/plugins_graphdriver.md
Signed-off-by: Collin Guarino <collin.guarino@gmail.com>
Upstream-commit: 9e760ec497
Component: cli
2017-06-02 00:07:24 +00:00
9481d536f7 Remove Pachyderm storage driver.
Signed-off-by: Joe Doliner <jdoliner@gmail.com>
Upstream-commit: 07d04dcea6
Component: cli
2017-06-02 00:07:24 +00:00
ebede0287e Add Subnets info for user-defined network
* If user doesn't specify the subnets to create a network, it will pick
  subnets from inside preferred pool. This PR aims to inspect these subnets info

* Add integration tests for docker inspect the subnets.

* docker-py project is already synchronized.

* jenkins checks depend on https://github.com/docker/docker-py/pull/888

Fixes issue #18626

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 9f64dc98bd
Component: cli
2017-06-02 00:07:24 +00:00
43dfce8417 Allow to set daemon and server configurations in a file.
Read configuration after flags making this the priority:

1- Apply configuration from file.
2- Apply configuration from flags.

Reload configuration when a signal is received, USR2 in Linux:

- Reload router if the debug configuration changes.
- Reload daemon labels.
- Reload cluster discovery.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: ad43730d0f
Component: cli
2017-06-02 00:07:24 +00:00
58f644a5d3 WIP: Update security docs for seccomp/apparmor
Signed-off-by: Mary Anthony <mary@docker.com>

Updaing and slight re-arrangement of security information

Signed-off-by: Mary Anthony <mary@docker.com>

Updating security files

Signed-off-by: Mary Anthony <mary@docker.com>

Updating links to the security documentation

Signed-off-by: Mary Anthony <mary@docker.com>

removing some extra spaces

Signed-off-by: Mary Anthony <mary@docker.com>

Correcting spelling

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: bb94c5077c
Component: cli
2017-06-02 00:07:24 +00:00
89105f6e4c Document that detach keys are a list of key bindings
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 775e7a02a3
Component: cli
2017-06-02 00:07:24 +00:00
d9137eb323 bash completion for --detach-keys
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: de6da285a3
Component: cli
2017-06-02 00:07:24 +00:00
6fb9fe70ad Add IPAM Config Options to match libnetwork
Signed-off-by: Ryan Belgrave <rmb1993@gmail.com>
Upstream-commit: 82e9cba6d4
Component: cli
2017-06-02 00:07:24 +00:00
732a628e72 Network scoped alias support
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 46db31de0a
Component: cli
2017-06-02 00:07:24 +00:00
e1a131a6cc Add network ID to container inspect
Fixes issue #19089

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: ea995dd3ba
Component: cli
2017-06-02 00:07:23 +00:00
b9b85d551f Forced endpoint cleanup
docker's network disconnect api now supports `Force` option which can be
used to force cleanup an endpoint from any host in the cluster.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: e686b4d8be
Component: cli
2017-06-02 00:07:23 +00:00
0570aaed74 Add missing documentation for static IP options
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: d3aa590eec
Component: cli
2017-06-02 00:07:23 +00:00
4e0c23bead daemon option (--storage-opt dm.basesize) for increasing the base device size on daemon restart
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 1e83a27ca1
Component: cli
2017-06-02 00:07:23 +00:00
a73814be6f Rename authz to authorization for greater clarity
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7f6a7ed8d1
Component: cli
2017-06-02 00:07:23 +00:00
03fa76c2d2 Add network interal mode
Signed-off-by: Chun Chen <ramichen@tencent.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3f5817fdae
Component: cli
2017-06-02 00:07:23 +00:00
387a498ba3 bash completion for connecting non-running containers to networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 9c8b6e05a4
Component: cli
2017-06-02 00:07:23 +00:00
1996d937de Added additional container information to "docker info".
Instead of just showing the number of containers this patch will
show the number of running, paused and stopped containers as well.

Signed-off-by: Kim Eik <kim@heldig.org>
(cherry picked from commit a9804ab1cb117a132cbf460067d55f5146d50956)
Upstream-commit: 22aaf42a84
Component: cli
2017-06-02 00:07:23 +00:00
26855c6072 Docs update for link functionality in user-defined networks
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: bf03439e68
Component: cli
2017-06-02 00:07:23 +00:00
335f1d6145 Prune digest references when deleting by tag
When pulling an image with content trust enabled, two references are
created: a digest reference and a tag reference. Deleting by tag
wouldn't actually remove the image, because the digest reference keeps
it alive.

This change modifies the rmi logic so that digest references don't keep
an image alive. If the last tag referencing a given image is deleted,
any digest references to it will be removed as well, so the image can
actually get deleted. This fixes the usability problem with deletions
when content trust is in use, so something like "docker pull busybox;
docker rmi busybox" will work as expected.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 442cbbfac1
Component: cli
2017-06-02 00:07:23 +00:00
4680c89426 Add zsh completion for 'docker daemon --userns-remap'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 66cb79eb98
Component: cli
2017-06-02 00:07:23 +00:00
4c752f535e Add daemon documentation on user namespaces feature
Remove the experimental docs for user namespaces and add similar content
to the `docker daemon` command documentation.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 36960be45f
Component: cli
2017-06-02 00:07:23 +00:00
d48486e53f Add docker network connect/disconnect to non-running container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b5843f62f8
Component: cli
2017-06-02 00:07:23 +00:00
20429a2b3a Fix ambassador script based on SvenDowideit/dockerfiles#37
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 5142d3a669
Component: cli
2017-06-02 00:07:23 +00:00
0ef899dd2d Add zsh completion for 'docker {build,create,run} --isolation'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 97d56a6cd8
Component: cli
2017-06-02 00:07:23 +00:00