Commit Graph

118 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
83978ae0df add missing instruction
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: 08481e81ca
Component: cli
2017-06-02 00:07:06 +00:00
cf8e51051f Add format description in run doc
And only set false to --oom-kill-disable, we just need the default
value to show.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 1219ef846c
Component: cli
2017-06-02 00:07:06 +00:00
c1c4fe18cf Adding support to publish on custom host port ranges
Signed-off-by: Don Kjer <don.kjer@gmail.com>

Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 49acf8c522
Component: cli
2017-06-02 00:07:06 +00:00
374c800384 remove references to 'source repository'
- rewrite intro to Dockerfile reference usage section to remove
   references to 'source repository'
- Closes #14714
- Fixes:  #8648
- Updating with Seb's comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: e0d42a679c
Component: cli
2017-06-02 00:07:06 +00:00
73a2904d6e Updating hashcode links to commands
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 58a37fe8cf
Component: cli
2017-06-02 00:07:06 +00:00
22fab2f19a reference/run: Some editorial changes
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.

Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: eb1d7c01a2
Component: cli
2017-06-02 00:07:06 +00:00
622db7d10b reference/run: Add some articles
Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: 33e158b9fc
Component: cli
2017-06-02 00:07:06 +00:00
143c265b75 reference/run: Add a paragraph break
Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: d4b510c608
Component: cli
2017-06-02 00:07:06 +00:00
99a3735fd0 reference/run: Clarify the use of numeric UIDs
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795

Signed-off-by: Kai Blin <kai@samba.org>
Upstream-commit: 7cc23c78c0
Component: cli
2017-06-02 00:07:06 +00:00
519334c5f4 add documentation clarifying behavior of VOLUME instruction
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com>
Upstream-commit: d3dae7f652
Component: cli
2017-06-02 00:07:05 +00:00