Commit Graph

861 Commits

Author SHA1 Message Date
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
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
4feecc2ab5 typo
Signed-off-by: Bill Wang <ozbillwang@gmail.com>
Upstream-commit: aba3fa1040
Component: cli
2017-06-02 00:07:09 +00:00
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
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
e50ac3ff79 fix doc about vol
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: d204132ee6
Component: cli
2017-06-02 00:07:09 +00:00
b5335d2b04 Add log reading to the journald log driver
If a logdriver doesn't register a callback function to validate log
options, it won't be usable.  Fix the journald driver by adding a dummy
validator.

Teach the client and the daemon's "logs" logic that the server can also
supply "logs" data via the "journald" driver.  Update documentation and
tests that depend on error messages.

Add support for reading log data from the systemd journal to the
journald log driver.  The internal logic uses a goroutine to scan the
journal for matching entries after any specified cutoff time, formats
the messages from those entries as JSONLog messages, and stuffs the
results down a pipe whose reading end we hand back to the caller.

If we are missing any of the 'linux', 'cgo', or 'journald' build tags,
however, we don't implement a reader, so the 'logs' endpoint will still
return an error.

Make the necessary changes to the build setup to ensure that support for
reading container logs from the systemd journal is built.

Rename the Jmap member of the journald logdriver's struct to "vars" to
make it non-public, and to make it easier to tell that it's just there
to hold additional variable values that we want journald to record along
with log data that we're sending to it.

In the client, don't assume that we know which logdrivers the server
implements, and remove the check that looks at the server.  It's
redundant because the server already knows, and the check also makes
using older clients with newer servers (which may have new logdrivers in
them) unnecessarily hard.

When we try to "logs" and have to report that the container's logdriver
doesn't support reading, send the error message through the
might-be-a-multiplexer so that clients which are expecting multiplexed
data will be able to properly display the error, instead of tripping
over the data and printing a less helpful "Unrecognized input header"
error.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com> (github: nalind)
Upstream-commit: a821292ec8
Component: cli
2017-06-02 00:07:08 +00:00
8d0688201f Make daemon to start with no userlandproxy by default
This PR makes a user visible behavior change with userland
proxy disabled by default and rely on hairpin NAT to be enabled
by default. This may not work in older (unsupported) kernels
where the user will be forced to enable userlandproxy if needed.

      - Updated the Docs
      - Changed the integration-cli to start with userlandproxy
	desiabled by default.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 3dff6170d6
Component: cli
2017-06-02 00:07:08 +00:00
016d3c3aa6 Add STOPSIGNAL instruction to dockerfiles.
This way, images creators can set the exit signal their programs use.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f5b80326a1
Component: cli
2017-06-02 00:07:08 +00:00
a522975349 Signal to stop a container.
Allow to set the signal to stop a container in `docker run`:
- Use `--stop-signal` with docker-run to set the default signal the container will use to exit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 36a36bdaf5
Component: cli
2017-06-02 00:07:08 +00:00
1ef4dd2a6c Add awslogs driver for Amazon CloudWatch Logs
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 0d2d916b13
Component: cli
2017-06-02 00:07:08 +00:00
6cdd6e3a6b update docker volume man pages
- added --help option
- fixed several formatting problems

Also added --help to volume inspect reference page.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: e8447c157d
Component: cli
2017-06-02 00:07:08 +00:00
aef04c70b9 bash completion for docker volume
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 6c98ca574f
Component: cli
2017-06-02 00:07:08 +00:00
0d8d6d57ac Add missing ps placeholder to the docs.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 54a47bdcaa
Component: cli
2017-06-02 00:07:08 +00:00
e92eccedb6 man docker-tag minor fixup
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 1f974f76ad
Component: cli
2017-06-02 00:07:08 +00:00
5b7698a1f6 Fix usage for docker volume inspect and docker volume rm
For both commands, volume is _not_ optional. Several volumes may
be specified.
Both commands now use the same name (VOLUME) for the command argument.

Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 849b5b6d67
Component: cli
2017-06-02 00:07:08 +00:00
dc9efd3901 Typo in cp.md
Closes #16124

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 56b46dca76
Component: cli
2017-06-02 00:07:08 +00:00
4bb65211ba move pachyderm PFS link above rex ray link in docs/extend/plugins.md
Signed-off-by: Peter Edge <peter.edge@gmail.com>
Upstream-commit: b2fbeee10e
Component: cli
2017-06-02 00:07:08 +00:00
2d36f8b768 Add link to Pachyderm PFS volume driver plugin in plugins.md
Signed-off-by: Peter Edge <peter.edge@gmail.com>
Upstream-commit: bf2625bf1f
Component: cli
2017-06-02 00:07:08 +00:00
f264c481a4 Fix minor typo in docs
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 2edd24ea80
Component: cli
2017-06-02 00:07:08 +00:00
169732b97d correct man docker-pull
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: ecbf92d66c
Component: cli
2017-06-02 00:07:08 +00:00
af60232055 add --insecure-registry warning to online docs
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 5d85be4a3c
Component: cli
2017-06-02 00:07:08 +00:00
dba900f55b man Dockerfile ADD/COPY/FROM clarify
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 621debd575
Component: cli
2017-06-02 00:07:08 +00:00
63a3c51013 clarify --insecure-registry in man docker
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: c90013c460
Component: cli
2017-06-02 00:07:08 +00:00
034997662b Remove PortMapping from container NetworkSettings
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 1c26392626
Component: cli
2017-06-02 00:07:07 +00:00
5c0a31aa05 Add docker ps --filter=… image completion
I missed that on #15919, thanks @albers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 1cf99bf127
Component: cli
2017-06-02 00:07:07 +00:00
d3348772c2 Warning message for lvm devmapper running on top of loopback devices
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: d5394a0d5f
Component: cli
2017-06-02 00:07:07 +00:00
14dfc30977 Update shell completion on docker ps for ancestor
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8387eacede
Component: cli
2017-06-02 00:07:07 +00:00
b36315741b ubuntu-14-10-x64 is not a valid image on digital ocean
Signed-off-by: Jordan Jennings <jjn2009@gmail.com>
Upstream-commit: d05294bae4
Component: cli
2017-06-02 00:07:07 +00:00
f286f8afde Add 'ancestor' ps filter for image
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 67f663c7bf
Component: cli
2017-06-02 00:07:07 +00:00
41371def9d Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>

Added note about process interaction with container in detached mode

Signed-off-by: Dharmit Shah <shahdharmit@gmail.com>
Upstream-commit: 23effb34d7
Component: cli
2017-06-02 00:07:07 +00:00
2b021a1765 Update filtering chapters on ps/images references
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 898614f30a
Component: cli
2017-06-02 00:07:07 +00:00
ccd9b5c29e Builder counts from 1
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6d275805ad
Component: cli
2017-06-02 00:07:07 +00:00
fb53625655 Add volume API/CLI
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1f10226bfd
Component: cli
2017-06-02 00:07:07 +00:00
53111401ba adding message option to the import subcommand
Signed-off-by: Taylor Jones <monitorjbl@gmail.com>
Upstream-commit: f4060b1f65
Component: cli
2017-06-02 00:07:07 +00:00
3eda380217 Update plugins.md
Add Convoy to Docker plugin list.

Signed-off-by: Sheng Yang <sheng.yang@rancher.com>
Upstream-commit: a5f2ecff80
Component: cli
2017-06-02 00:07:07 +00:00
fe402d05bb Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: a5c18a853e
Component: cli
2017-06-02 00:07:07 +00:00
74c0fd37cc Add unless-stopped restart policy
Fixes #11008

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: df39b0146b
Component: cli
2017-06-02 00:07:07 +00:00
ff311ecafd explain how to make it work on awazon ec2.
Signed-off-by: Klein Florian <florian.klein@free.fr>
Upstream-commit: e1733b4db6
Component: cli
2017-06-02 00:07:07 +00:00
a302fd9a45 Change all optional unit to [unit]
As suggested before, we should change every signal one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b243bbed9c
Component: cli
2017-06-02 00:07:07 +00:00
0ae8a6bd4d Revert "Fix broken links at plugins documentation"
This reverts commit 354147df012dd35f82e59e3511d9be4fc7610352.

Signed-off-by: Álex González <agonzalezro@gmail.com>
Upstream-commit: 445e4600f2
Component: cli
2017-06-02 00:07:07 +00:00
e076ea4c2f Fix broken links at plugins documentation
Signed-off-by: Álex González <agonzalezro@gmail.com>
Upstream-commit: b64dba4262
Component: cli
2017-06-02 00:07:07 +00:00
7528eacd46 Make run and rmi bash completions configurable
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:

DOCKER_COMPLETION_SHOW_IMAGE_IDS
  "none" - Show names only (default)
  "non-intermediate" - Show names and ids, but omit intermediate image IDs
  "all" - Show names and ids, including intermediate image IDs

DOCKER_COMPLETION_SHOW_TAGS
  "yes" - include tags in completion options (default)
  "no"  - don't include tags in completion options

Fixes #9474.

Signed-off-by: Rory Hunter <roryhunter2@gmail.com>
Upstream-commit: e7d0fd2b23
Component: cli
2017-06-02 00:07:06 +00:00
1386a1809c Add support for kernel memory limit
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 5731775665
Component: cli
2017-06-02 00:07:06 +00:00
0d081855af specify the docker run --rm action
Signed-off-by: He Simei <hesimei@zju.edu.cn>
Upstream-commit: 90cf0587f1
Component: cli
2017-06-02 00:07:06 +00:00
57f4813b6b fix format man-commit
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 91502290a5
Component: cli
2017-06-02 00:07:06 +00:00
ecd5fc0b6e add -H to SYNOPSIS man-history
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: 1c26439cbb
Component: cli
2017-06-02 00:07:06 +00:00
2fafbcba32 Add gists provided by Mary
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 27b1ab4116
Component: cli
2017-06-02 00:07:06 +00:00
64d754f612 run.md: --expose does NOT override Dockerfile EXPOSE
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.

This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.

Signed-off-by: Spencer Brown <spencer@spencerbrown.org>
Upstream-commit: a419da588f
Component: cli
2017-06-02 00:07:06 +00:00
3376746a0c add weight to daemon page so it renders in order
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 4ddb2c2a8d
Component: cli
2017-06-02 00:07:06 +00:00