Commit Graph

394 Commits

Author SHA1 Message Date
ab127964ad Shorten help messages for docker cmd flags
In order to fit printed messages to fit 80 chars,
rewording messages for `-H` and `--tls` flags.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 27a73a98b704b77eaa7c4caebfeaa84743969c67
Component: engine
2015-02-18 22:52:33 -08:00
bc6bb1e0e5 Merge pull request #10779 from duglin/10771-FixStatsHelp
Fix 'docker stats' help message
Upstream-commit: 9054e4dca3320ec769a02aed8c19aac577688992
Component: engine
2015-02-16 11:18:58 -08:00
4a9bcf2320 Merge pull request #10571 from jfrazelle/8689-remove-all-aliases
Removes the feature to pull all image aliases.
Upstream-commit: 9ea20f260c0a31d6a0e939a099f7005e93507eea
Component: engine
2015-02-16 10:29:20 -08:00
7a0aaa5999 Use newer help out for 'docker' and 'docker run'
Closes #10828

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: effa5e2c18f27b81fc46d1a925d04e6af5695459
Component: engine
2015-02-16 08:46:07 -08:00
79ea7dd989 Fix 'docker stats' help message
Closes #10771

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b55346b3279a3243da8cab82a7ddc427454aba61
Component: engine
2015-02-13 12:45:50 -08:00
2c48e42531 Update docs for HTTP_PROXY
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7a7c00ca0834e6bad0132d834399bcee4d3b957b
Component: engine
2015-02-12 11:40:56 -08:00
d10ffd08ef Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
Documentation on boolean flags is wrong #10517
Upstream-commit: e706be77a46b11ed2202e226b10f547aa85a8a85
Component: engine
2015-02-06 15:12:11 -08:00
2d864c1626 Fix example about ps and linked containers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0f8f04a77492ddf37ca9c163ef0c3ddaf8a93a40
Component: engine
2015-02-06 14:05:08 -08:00
f3b4b47f92 Documentation on boolean flags is wrong #10517
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1e6e68361c6cc42ab92288e0a0132b14ef6c9426
Component: engine
2015-02-06 19:52:01 +10:00
8eee87ed67 Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
For now, docker stats appears to be libcontainer only
Upstream-commit: 68b0ed54cb7ed9e4b66e8a9e0708577b32088de2
Component: engine
2015-02-05 17:52:36 -08:00
a31c4ae7c4 Fix a small spelling error in the dm.blkdiscard docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fcb975cfd17cfbe45b7f6661c2c1c4a94de04c94
Component: engine
2015-02-05 10:57:33 +10:00
13f79dd103 Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
Upstream-commit: 1cc774b4faebdc11f419add5467a6bc19288bce9
Component: engine
2015-02-05 10:21:00 +10:00
38af1c98bd For now, docker stats appears to be libcontainer only
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 2507e0b64fc037a38bf48405b9a0cce1e56cb7c8
Component: engine
2015-02-05 10:12:05 +10:00
c75462bc54 Removes the feature to pull all image aliases.
It didn't work on v2 anyways. And an image with a lot of aliases was slow to
fetch.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 72a9000fcfa2ec5a2c4a29fb62a17c34e6dd186f
Component: engine
2015-02-04 15:06:34 -08:00
8423899da1 Merge pull request #10547 from duglin/Issue10214
Pretty the help text
Upstream-commit: a271eaeba224652e3a12af0287afbae6f82a9333
Component: engine
2015-02-04 11:31:18 -08:00
013dbb146f Pretty the help text
This modifies the "docker help" text so that it is no wider than 80 chars
and each description fits on one line. This will also try to use ~ when
possible

Added a test to make sure we don't go over 80 chars again.
Added a test to make sure we use ~

Applied rules/tests to all docker commands - not just main help text

Closes #10214

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2203b37733e76d653cfe3b0ec5870786076adce7
Component: engine
2015-02-04 07:59:16 -08:00
e21086902c Spelling mistake in dockerlinks
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ea6db8af18c9eee2147d78f987cdacacd37e93fb
Component: engine
2015-02-04 12:12:46 +10:00
e0ba739be5 Docker attach documentation didn't make sense to me
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: e58fdaae056491207349df8747289ed52e04462a
Component: engine
2015-02-03 11:53:14 +10:00
a661737346 docs: change events --since to fit RFC3339Nano
PR6931 changed time format to RFC3339Nano.
But the example in cli.md does not changed.

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: d619b5594ba136ab285b93128bbe8fe246678488
Component: engine
2015-02-02 22:39:03 +08:00
32b5682b75 Merge pull request #10145 from duglin/Issue10141
Docker run -e FOO should erase FOO if FOO isn't set in client env
Upstream-commit: edaf23b7a7f71626bdafb4e3a9677ad05fa17cab
Component: engine
2015-01-21 14:16:51 -08:00
f0170e8737 Update to docker stats documentation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: db9b1e3654464b0e7008fbad15d43fbbba87b1a4
Component: engine
2015-01-21 11:44:23 -08:00
a77fb96f4c Add documentation for stats feature
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 76141a00779880368b15ef2a5ffd28a80e4637df
Component: engine
2015-01-20 20:21:47 -08:00
1c8677b886 Merge pull request #10206 from jfrazelle/add-docs-memory-swap
Add docs for `--memory-swap`.
Upstream-commit: a276706719a9c2d437c643281639ffa80daf1fdd
Component: engine
2015-01-20 18:20:13 -05:00
304cd59f67 Merge pull request #10135 from coolljt0725/update_link_docs
Update the docs for --link accept container id
Upstream-commit: e6a70a6f819c09f2d33b59adc7378f758349ae6d
Component: engine
2015-01-19 18:12:50 -08:00
f4d05bcf4d Merge pull request #10124 from duglin/Issue10034
Add the list of possible values for --log-level to help text
Upstream-commit: 1efc940e6f547760e5e8f4648acb120ff19fdc58
Component: engine
2015-01-19 17:09:18 -08:00
3a60e835c5 Add docs for --memory-swap.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7bb4b56cf98662ef5f1deb64bdf8a120490bc258
Component: engine
2015-01-19 16:17:58 -08:00
51e443fb29 Add documentation for HTTP proxies
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
2015-01-19 11:23:31 -08:00
5d2fe159f4 Docker run -e FOO should erase FOO if FOO isn't set in client env
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container.  This means that if there's a value, its
set.  But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env.  So,
   unset HOSTNAME
   docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all

Closes #10141

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9ab73260f8e4662e7321b257c636928892f023cf
Component: engine
2015-01-19 08:00:32 -08:00
b9a7e1b9ee Fix typo.
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
2015-01-19 18:02:23 +08:00
9f931ee8fa Update the docs for --link accept container id
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
2015-01-19 09:57:44 +08:00
611f8510fe Merge pull request #9941 from SvenDowideit/build-pull-option-docs
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
2015-01-16 13:49:56 -08:00
712286a324 Merge pull request #10125 from estesp/9960-add-backingfs-info
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
2015-01-16 13:41:37 -08:00
310b2cd524 Add backing filesystem info to docker info command where applicable
Fixes #9960

This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 48b1dd0084904678728817d728bb9ab1c0183aad
Component: engine
2015-01-16 14:43:43 -05:00
1964402004 Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export
Docs: Add note that export doesn't include volume data.
Upstream-commit: 9725433988b7d83bcbbf2af1976995efc0aadd4e
Component: engine
2015-01-16 12:15:46 +13:00
8333dd3c16 Merge pull request #9840 from nhsiehgit/searchapidocs
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
468fbf0066 Add the list of possible values for --log-level to help text
Closes #10034

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ed13110e88846694a675696c161ce6456402f3ef
Component: engine
2015-01-15 12:20:41 -08:00
3b76395570 changed format of cli note
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: c252d5f3f4fc98062fbda6335a04cca2602a4223
Component: engine
2015-01-15 08:39:16 -08:00
3abcc54bab Docs: Add note that export doesn't include volume data.
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.

This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.

Relates to https://github.com/docker/docker/issues/10095

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
792af8c0a5 Add build --pull and evenets --filter flags to the docs for 1.4
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 18a2c77435cdad8f759421500cba6ac20057daf8
Component: engine
2015-01-15 15:20:48 +13:00
c72b573e2b added note to man & cli docs on search limit
Signed-off-by: Nathan Hsieh <hsieh.nathan@gmail.com>
Upstream-commit: 92ef40a8260e5e8dcd5579a6f9d942c4e68702ed
Component: engine
2015-01-14 18:03:09 -08:00
2a3eb3ae39 Merge pull request #10093 from crosbymichael/readonly-containers
Add --read-only for read only container rootfs
Upstream-commit: 95c0f07966035ce79c6b51a2eee8c60c59fb523c
Component: engine
2015-01-14 15:56:51 -08:00
2ef8faf6e3 Add --readonly for read only container rootfs
Add a --readonly flag to allow the container's root filesystem to be
mounted as readonly.  This can be used in combination with volumes to
force a container's process to only write to locations that will be
persisted.  This is useful in many cases where the admin controls where
they would like developers to write files and error on any other
locations.

Closes #7923
Closes #8752

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 409407091a7282d0c4086b71e86397e2d089ba13
Component: engine
2015-01-14 15:41:31 -08:00
bafbcb6583 Add a note that remote and Boot2Docker users should not type sudo
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
458ae31cfd Allow the container to share the PID namespace with the host
We want to be able to use container without the PID namespace.  We basically
want containers that can manage the host os, which I call Super Privileged
Containers.  We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.

By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use.  We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.

I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.

So currently I see us just needing docker run --pid=host

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
Upstream-commit: 23feaaa240853c0e7f9817f8c2d272dd1c93ac3f
Component: engine
2015-01-13 16:35:17 -08:00
eacdfc7d44 rename a existing container
Closes #3036

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 21a809d9ae0ef8392f37c9262dca93ff31966e22
Component: engine
2015-01-13 03:27:17 +00:00
d352fd4587 Merge pull request #9962 from andi5/fix-doc-cmdline-port
Fix order of pause and port in command line documentation.
Upstream-commit: 43a75f5b9332f4b3c002f79ea342b00127811b5b
Component: engine
2015-01-12 13:22:51 -08:00
146962fdd3 Adding IPv6 network support to docker
Signed-off-by: Malte Janduda <mail@janduda.net>
Upstream-commit: 813ff7f19d6a097f39dae363d8dd81b70eee515a
Component: engine
2015-01-09 00:13:09 +01:00
093790b35a Fix order of pause and port in command line documentation.
Signed-off-by: Andreas Köhler <andi5.py@gmx.net>
Upstream-commit: 3807d96d379cb5b08ad3dae3d624fb3d24306b77
Component: engine
2015-01-08 23:21:54 +01:00
14432954b7 Merge pull request #9898 from SvenDowideit/document-https-proxy-daemon-setup
Add @ArikaChen's tip for using HTTPS proxy to pull
Upstream-commit: b168ef274aa6676d2fa4da071b06def22f3824be
Component: engine
2015-01-08 10:40:02 -08:00
269ee3bcdf Allow for Dockerfile to be named something else.
Add a check to make sure Dockerfile is in the build context
Add docs and a testcase
Make -f relative to current dir, not build context

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: eb3ea3b43c716ad727521a7d0bc20d7321bb0867
Component: engine
2015-01-06 16:33:26 -08:00