Commit Graph
906 Commits
Author SHA1 Message Date
Harald Albers 5196a71aac Add bash completion for --cluster-store-opt
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 4fcea52287
Component: cli
2017-06-02 00:07:12 +00:00
Mike Brown d7d36514c0 man update for docker run with host volumes
Signed-off-by: Mike Brown <brownwm@us.ibm.com>

cleaning up docker run -v documentation for man and web reference guide

Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: b5a037443d
Component: cli
2017-06-02 00:07:11 +00:00
Luca Marturana 49b87bae2e Sync with remote API
Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also container events

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>

Sync also man page

Signed-off-by: Luca Marturana <lucamarturana@gmail.com>
Upstream-commit: f8a62fd1c5
Component: cli
2017-06-02 00:07:11 +00:00
Yuan Sun 845db3988b Add description for "--cpu-shares=0".
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 92512fdf32
Component: cli
2017-06-02 00:07:11 +00:00
Daniel Hiltgen ccc6356be8 Add TLS support for discovery backend
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS.  Example usage:

    docker daemon [other args] \
        --cluster-advertise 192.168.122.168:2376 \
        --cluster-store etcd://192.168.122.168:2379 \
        --cluster-store-opt kv.cacertfile=/path/to/ca.pem \
        --cluster-store-opt kv.certfile=/path/to/cert.pem \
        --cluster-store-opt kv.keyfile=/path/to/key.pem

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 323fb21864
Component: cli
2017-06-02 00:07:11 +00:00
Brian Goff 3a46a763dc Create extpoint for graphdrivers
Allows people to create out-of-process graphdrivers that can be used
with Docker.

Extensions must be started before Docker otherwise Docker will fail to
start.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 7beb4061e1
Component: cli
2017-06-02 00:07:11 +00:00
Deng Guangxing 36d10565e6 update dockernetwork.md and network api
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: b923d8af3e
Component: cli
2017-06-02 00:07:11 +00:00
Mary Anthony f33e7e36a6 Fixing issues in command ordering. Adding index.md
Adjust bullets
Entering Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d45666f869
Component: cli
2017-06-02 00:07:11 +00:00
Grant Reaber 690359813b clarify dockerignore semantics
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
Upstream-commit: 42fe72228d
Component: cli
2017-06-02 00:07:11 +00:00
Aidan Hobson Sayers 0e98ff8444 Mention more realistic examples are available
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: d86cfdfb84
Component: cli
2017-06-02 00:07:11 +00:00
Aidan Hobson Sayers 49281f044b Don't put dockerfiles in one continuous code block
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 090ad2bb8a
Component: cli
2017-06-02 00:07:11 +00:00
Madhu Venugopal ae63a50726 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: da80c0929a
Component: cli
2017-06-02 00:07:11 +00:00
Jessica Frazelle 40051ff694 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0afb6cc862
Component: cli
2017-06-02 00:07:11 +00:00
Vivek Goyal 606d386d6d devmapper: Provide option to enabled deferred device deletion
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.

Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: fba8aeb14b
Component: cli
2017-06-02 00:07:11 +00:00
Vincent Demeester 9eb4fc2912 Update documentation on the revert on env validation
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2a36a93d04
Component: cli
2017-06-02 00:07:11 +00:00
Steve Durrheimer 41270896e7 Add zsh completion for 'docker daemon --no-legacy-registry'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 53089d74fe
Component: cli
2017-06-02 00:07:11 +00:00
Antonio Murdaca ba5c93f531 Fix man and commandline docs
- missing help option in `docs/reference/commandline/*.md` (some files
  have it, the other I fixed didn't)
- missing `[OPTIONS]` in Usage description
- missing options
- formatting
- start/stop idempotence

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: cbd33a2b27
Component: cli
2017-06-02 00:07:11 +00:00
Harald Albers 530fe2b9f7 Add bash completion for --no-legacy-registry
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 1b1a0a0835
Component: cli
2017-06-02 00:07:10 +00:00
Daniel Nephin 4144683a0f Documentation for filtering events by label
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f361ebdea6
Component: cli
2017-06-02 00:07:10 +00:00
Sally O'Malley 2dcd0d901a typo man/search
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: a15bc5d01a
Component: cli
2017-06-02 00:07:10 +00:00
Steve Durrheimer 3e4a3f9b84 Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 88ef8f31aa
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers c6d4699aa4 bash completion for docker daemon --cluster-*
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3fce5e1084
Component: cli
2017-06-02 00:07:10 +00:00
Richard Scothern cda415abcc Command line, manpage and deprecation documentation.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
Upstream-commit: 2f288fe894
Component: cli
2017-06-02 00:07:10 +00:00
Shishir Mahajan e482ad5647 Add dns-opt option to docker daemon man page
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 841fc5d155
Component: cli
2017-06-02 00:07:10 +00:00
Arnaud Porterie 2a1240949d Add builtin nodes discovery
Use `pkg/discovery` to provide nodes discovery between daemon instances.

The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:

1. Externally by calling the `/info` API and examining the cluster store
   field. The `pkg/discovery` package can then be used to hit the same
   endpoint and watch for appearing or disappearing nodes. That is the
   method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
   the method that will for example be used by libnetwork.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: f95e9f7c72
Component: cli
2017-06-02 00:07:10 +00:00
Charles Chan ddf084d760 Touch up "Dockerfile reference"
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 0039e46e3e
Component: cli
2017-06-02 00:07:10 +00:00
Tim Waugh 6a2b5a7a84 Add documentation note that LABEL allows environment replacement
Signed-off-by: Tim Waugh <twaugh@redhat.com>
Upstream-commit: a8db81a89a
Component: cli
2017-06-02 00:07:10 +00:00
Shishir Mahajan e10877ef64 man page for docker daemon command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 2e8a8547d9
Component: cli
2017-06-02 00:07:10 +00:00
qhuang c7f7b0b0c5 Add support for memory reservation
Signed-off-by: qhuang <qhuang@10.0.2.15>
Upstream-commit: d5b1d055b8
Component: cli
2017-06-02 00:07:10 +00:00
Hu Keping 055dc01851 Format output of docker info
Format those info which will only be displayed when daemon is
in debug mode.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 1ba09d5d08
Component: cli
2017-06-02 00:07:10 +00:00
Morgan Bauer ed090ff91e fix typo in man page
- resolve #16536

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: b112dcfed4
Component: cli
2017-06-02 00:07:10 +00:00
Lei Jitang e4e2ea0cbd Docs: correct the description of docker cp
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 9ec9856889
Component: cli
2017-06-02 00:07:10 +00:00
Steve Durrheimer f67f9bd91a Catchup missing changes for the zsh completion
- felixr/docker-zsh-completion@6ae6279: Add --privileged flag to docker exec command in zsh completion
 - felixr/docker-zsh-completion@259ea00: Remove -h help flag from subcommands in zsh completion
 - felixr/docker-zsh-completion@5f77b29: Add docker ps --format flag to zsh completion
 - felixr/docker-zsh-completion@a1f39f8: Add --config flag to zsh completion
 - felixr/docker-zsh-completion@6a503b4: Filter zsh completions of inspect command by --type
 - felixr/docker-zsh-completion@d286ccd: Add --ulimit flag to build command to zsh completion
 - felixr/docker-zsh-completion@bdc1261: Add support for kernel memory limit in zsh completion
 - felixr/docker-zsh-completion@c8ce164: Add docker volume command and subcommands in zsh completion
 - felixr/docker-zsh-completion@7f996bf: Add docker daemon command to zsh completion
 - felixr/docker-zsh-completion@4ccd292: Be more generic when parsing "docker ps" output.
 - felixr/docker-zsh-completion@cd0f1b9: Fix container completion by name
 - felixr/docker-zsh-completion@8bf9041: Use "docker ps --no-trunc" to build completion.
 - felixr/docker-zsh-completion@b721bbb: Only keep the last name for a running/stopped container
 - felixr/docker-zsh-completion@6791b3e: Fix "docker run --stop-signal" completion
 - felixr/docker-zsh-completion@961f628: Try some heuristics to determine the canonical container name

Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 65c5e2b950
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers 5c93fb306b Bash completion: avoid 'compopt: command not found' errors on Mac OS
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.

If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 7310f4a2bd
Component: cli
2017-06-02 00:07:10 +00:00
Charles Chan f758afda44 Touch up 'docker logs' documentation.
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 83a6b3e927
Component: cli
2017-06-02 00:07:10 +00:00
Harald Albers e0b0bc40ce bash completion: use generic tag log driver option
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: eb684d2bad
Component: cli
2017-06-02 00:07:09 +00:00
Harald Albers c3a791a764 reference: capability all should be ALL
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 3058fcf68b
Component: cli
2017-06-02 00:07:09 +00:00
Zhang Kun 94ac212f5c add docker server version to /info
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 708318b076
Component: cli
2017-06-02 00:07:09 +00:00
Sally O'Malley 85e27f63c7 docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: fac1158156
Component: cli
2017-06-02 00:07:09 +00:00
Charles Chan 015504bdec Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 17fda32a53
Component: cli
2017-06-02 00:07:09 +00:00
Tom Denham 81561fcf99 Update the instructions for building experimental docker binaries
There is no dynbinary target.

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
Upstream-commit: cd90efa040
Component: cli
2017-06-02 00:07:09 +00:00
Madhav Puri 0a7b038a58 incorporate doc review comments
Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 9fab23902f
Component: cli
2017-06-02 00:07:09 +00:00
Madhav Puri a49195f1d6 Support for passing build-time variables in build context
- The build-time variables are passed as environment-context for command(s)
run as part of the RUN primitve. These variables are not persisted in environment of
intermediate and final images when passed as context for RUN. The build environment
is prepended to the intermediate continer's command string for aiding cache lookups.
It also helps with build traceability. But this also makes the feature less secure from
point of view of passing build time secrets.

- The build-time variables also get used to expand the symbols used in certain
Dockerfile primitves like ADD, COPY, USER etc, without an explicit prior definiton using a
ENV primitive. These variables get persisted in the intermediate and final images
whenever they are expanded.

- The build-time variables are only expanded or passed to the RUN primtive if they
are defined in Dockerfile using the ARG primitive or belong to list of built-in variables.
HTTP_PROXY, HTTPS_PROXY, http_proxy, https_proxy, FTP_PROXY and NO_PROXY are built-in
variables that needn't be explicitly defined in Dockerfile to use this feature.

Signed-off-by: Madhav Puri <madhav.puri@gmail.com>
Upstream-commit: 40a2dac738
Component: cli
2017-06-02 00:07:09 +00:00
Tim Hockin 8a794fe86d Add support for DNS options
Signed-off-by: Tim Hockin <thockin@google.com>
Upstream-commit: 8bdf17d8fe
Component: cli
2017-06-02 00:07:09 +00:00
Harald Albers e19ee5c257 Fix bash completion when extglob is not set
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: f5eb62c180
Component: cli
2017-06-02 00:07:09 +00:00
Jessica Frazelle e91c3f51fc Revert "Make daemon to start with no userlandproxy by default"
This reverts commit bf2b8ec8165468d7454f6bd86f4a78e7e8b58d8e.

Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 4948783f7c
Component: cli
2017-06-02 00:07:09 +00:00
Mike Brown 9c7329f418 updates to readme documents for manual page
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
Upstream-commit: ccb5d7469a
Component: cli
2017-06-02 00:07:09 +00:00
Bill W 4feecc2ab5 typo
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
Upstream-commit: aba3fa1040
Component: cli
2017-06-02 00:07:09 +00:00
Amen Belayneh 6a0da0245a update documentation styling as per suggestions
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 8ff51d3827
Component: cli
2017-06-02 00:07:09 +00:00
Amen Belayneh 3fef8fffb2 add a documentation note on backslash usage in shell form of RUN
Signed-off-by: Amen Belayneh <amenbelayneh@gmail.com>
Upstream-commit: 0ece7ed9d4
Component: cli
2017-06-02 00:07:09 +00:00