Commit Graph

952 Commits

Author SHA1 Message Date
6fd02194d0 Merge pull request #12289 from sunyuan3/docker_remote_api
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
2015-04-11 09:27:36 -05:00
dd126faafc update docker_remote_api_v1.*
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
2015-04-11 18:11:49 +08:00
d555f3e70e 'docker rmi -f IMAGE_ID' untag all names and delete the image
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:

        *untag all names and delete the image

        *add test to this feature

        *modify commandline/cli.md to explain this

Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
44fddcaf4b Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
2015-04-10 16:52:38 -04:00
d89c51c3b5 devmapper: storage-opt override for udev sync
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.

Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.

Including link to the docs for users that encounter this daemon error
during an upgrade.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
2015-04-10 15:43:16 -04:00
8c9e796ec1 Merge pull request #12218 from draghuram/apidoc_12055
Adds example request and Json parameter information for container
Upstream-commit: 6ab4878a015cecfc26426a9a9704ea04ac04666e
Component: engine
2015-04-10 11:22:57 -07:00
fdca34bdb1 Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
2015-04-10 08:29:29 -07:00
41fc757124 Adds example request and Json parameter information for container
start API.

Closes #10304.

Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
Upstream-commit: 202e0380f36be93ace139cb52e6c4752d195a034
Component: engine
2015-04-10 11:10:41 -04:00
5ed91523df Rebase + some fixes
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: fa2ace00a833492123f7db1e2f867f70bab89be4
Component: engine
2015-04-09 21:29:42 -04:00
3ee56a6e4d Refine document by review comments
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: 8d682bf734539ade2d618349f82b8b5e83a87167
Component: engine
2015-04-09 21:29:42 -04:00
807d6f107a Add comment column in docker history command output
Signed-off-by: David Young <yangboh@cn.ibm.com>
Upstream-commit: bf57339527f153b502a6443a495824a40768e39f
Component: engine
2015-04-09 21:29:41 -04:00
bc679a5419 cli: Better wording for daemon --log-driver
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.

Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: a4b7a9e1e5505983aea3f6d7e246c57a6f4f6170
Component: engine
2015-04-09 02:12:44 -07:00
a981a686fa docs: Markdown format fix around LogConfig param
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b66597eef18a02014e0b634dc3dc55dff3de4c20
Component: engine
2015-04-08 16:16:37 -07:00
c745cf0be5 Fix a typo in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 64fd944e30c8c045f6d998cc5ca950ea272541b5
Component: engine
2015-04-08 11:23:47 -04:00
27dad5da53 Carry PR 12008 for contributor
Closes #8040
Remove a tic for the hawk

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 87e70b6831386775a0d6c6b952c947865f1d053b
Component: engine
2015-04-07 14:09:53 -07:00
cb57509d97 Fix 2 typos in /doc/sources/reference/run.md
Signed-off-by: Yan Feng <yanfeng2@huawei.com>
Upstream-commit: 805f34bb5b6f639b3eb361672af2cbc7437e2ce9
Component: engine
2015-04-07 14:15:05 -04:00
84e28d150d Merge pull request #12055 from l0kix2/patch-1
Improved "start a container" section 1.16 & 1.17 API docs
Upstream-commit: ce18734c2cffebe112d06dca9117150ceaa08e15
Component: engine
2015-04-06 11:41:38 -07:00
142a5765d0 Merge pull request #11978 from x1022as/info-show-loggingdriver
docker info show logging driver info
Upstream-commit: ed8d4028519460017e5a8641882bd9a2e68ceb29
Component: engine
2015-04-06 11:11:31 -07:00
07de27cc12 Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS 
Upstream-commit: d489b91aa94a6e15d7d1daa953468cac9866f218
Component: engine
2015-04-06 09:23:53 -07:00
403c32d670 fix typo in cli.md
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 71de711189659847ea18313b7b0a57703960d0da
Component: engine
2015-04-06 16:11:40 +08:00
42748e46e4 fix the space thing.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 5057d7da132c287d52749b6c73a9cd6129a1c05a
Component: engine
2015-04-06 09:00:59 +08:00
828102e65e Improved "start a container" section in 1.16 & 1.17 docs
It seems it was lost or something

Signed-off-by: Kirill Sibirev <l0kix2@gmail.com>
Upstream-commit: ac12c8053779d36409e248f41c4d80ef0e4fbe9f
Component: engine
2015-04-04 11:23:49 +03:00
02c373c0f8 Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
docs: fix bullet list and missing label filter
Upstream-commit: fb1e10284bb04b29c21357675374fdd27a8ff3e4
Component: engine
2015-04-03 12:33:22 -07:00
c9d7b160f7 minor edits.
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8c578b8190a9abd5a48efa723878a12568f91e54
Component: engine
2015-04-03 14:43:21 +08:00
088a52cbda Merge pull request #11149 from duglin/8667-AdvancedVars
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
0b52fe32d3 docs: fix bullet list and missing label filter
Some bullet lists didn't render as bullet-lists because
of a missing newline.

Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 37c7f3a2046dc01c6c58ed64638faf136dd0682c
Component: engine
2015-04-02 01:48:28 +02:00
cd5f423b1f Bump API version and docs to v1.19
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
3e035d76a2 Add support for more advanced ${xxx:...} syntax
Just ${xxx:+...} and ${xxx:-...} for now

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
2015-04-01 08:11:15 -07:00
5a7a97d2b6 docker info show logging driver info
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: f5a401d3fe2e8c74e6b6a38e9073b843b16fae68
Component: engine
2015-04-01 16:05:14 +08:00
1394c160e0 Fix heading level of logging drivers
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.

Also changed "Log driver" to "logging driver" for JSON.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
2015-04-01 01:07:22 +02:00
bc620e0b67 Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
Fix-11752 add capabilities list information table.
Upstream-commit: 97f621bcd84af39a92b5450a9450941651749944
Component: engine
2015-03-30 23:18:30 -04:00
b39200ad98 Revison the some columns to make table clearer
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: bf15f675b9042db661de720900f367eff19737c0
Component: engine
2015-03-31 02:41:49 +00:00
55c259c94d fix issue #11676 #11754, disable RLIMIT_AS,edit DOCKER_OPTS
Signed-off-by: Simei He <hesimei@zju.edu.cn>
Upstream-commit: 8d3d34d5e310e6d3c80b4c3301b804a1edd25fb6
Component: engine
2015-03-31 10:13:37 +08:00
d7e9f5fdd9 Merge pull request #11799 from dqminh/aufs-dirperm1
aufs: apply dirperm1 by default if supported
Upstream-commit: 14fed352cbb29232af1644e49e019da897a44de6
Component: engine
2015-03-30 11:36:02 -07:00
5ba38993bc Explain --net=host option usage
Fixes #11630

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
2015-03-30 10:28:44 -07:00
6b249811ef Merge pull request #11678 from botchagalupe/docker-11465
Closes #11465 - Add additional doc for local registries on pull command
Upstream-commit: 41e47bbf34aa815fbc4fcec1247606b684bb9061
Component: engine
2015-03-29 14:10:20 -07:00
a0e1171855 Add Glossary to documentation
Closes #11057

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 567f723721b7bac57a91d82d27472e568a101c4f
Component: engine
2015-03-29 12:24:54 -07:00
3f29284d18 Remove dupllicated prefix to make table shorter & fix bugs
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
Upstream-commit: 194cad243ccf622c8ff048975e26cc6c51ccbf30
Component: engine
2015-03-28 01:49:28 +00:00
61457ac29a Add capabilities list information table.
Signed-off-by: Chen Qiu <21321229@zju.edu.cn>
Upstream-commit: 89a29d7e99e57bcbcf87a7657070bfdf59d7b6ad
Component: engine
2015-03-27 08:45:36 +00:00
1b99faf246 Merge pull request #11801 from hqhq/hq_fix_doc_for_exec
update docs for container exec
Upstream-commit: 296642035df602a788c042ae09573f65cd29b200
Component: engine
2015-03-26 15:31:16 -07:00
e5276fe0a7 Removing sudo from command line examples
We now advise people to configure docker group and
add to sudo.  Mac shouldn't use sudo.  Removed sudo
from command examples.  Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 29d01b7ddedb5d1b5ec2262e2d961b737cbc6f38
Component: engine
2015-03-26 11:12:37 -07:00
d294d535e9 Removing sudo from examples
We now have instructions in our Unix installs about setting up
docker group to avoid sudo.  Also, Mac/Windows shouldn't use
sudo.  So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: a4609a1dfbcfb2fea10aa2be15124e0809528d04
Component: engine
2015-03-26 10:13:19 -07:00
0c673d5d15 document dirperm1 fix for #783 in known issues
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it

Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
Upstream-commit: d7bbe2fcb5bf44f2fbcfa472e2a06c83d5d3aca1
Component: engine
2015-03-26 07:46:13 +00:00
f182e61c8b update docs for container exec
https://github.com/docker/docker/pull/11665 This PR changed container
exec API response, we need docs updated.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: fabb5114d808d127436121d28e320fd065f30865
Component: engine
2015-03-26 13:55:46 +08:00
0ee9f8042e Merge pull request #11776 from shin-/security_opt_docs_fix
API docs fix for SecurityOpt parameter.
Upstream-commit: f84086be2a570f02cbde3a4bd018d535def964d4
Component: engine
2015-03-25 18:20:59 -07:00
fa879dbf22 SecurityOpt parameter is singular, and belongs in HostConfig
since API 1.17

Signed-off-by: Joffrey F <joffrey@docker.com>
Upstream-commit: 61dba98608446f10b516a677753877cc3160173f
Component: engine
2015-03-25 16:25:13 -07:00
12d1265301 Rename Fds to File Descriptors in docker info
This makes the docker info more readable. Also change a log line
in a test file renaming Fds

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 161c2e5e74e06b863b91d0f325faf083530ae1b8
Component: engine
2015-03-25 12:04:15 -07:00
8d4b28771e Merge pull request #11715 from duglin/DocCliEnvVars
Add some info about what environment variables are available
Upstream-commit: dea660874ca3008af5c326a193ae5c657fefb30d
Component: engine
2015-03-25 07:29:27 -07:00
dc0bb844c3 Merge pull request #11694 from hqhq/hq_add_memsw_example
docs: add memory and swap memory usage examples
Upstream-commit: 67eb10defe0617c3dbb563002474e8e85b97b7bb
Component: engine
2015-03-25 07:01:44 -07:00
9d47ebbe4f Add some info about what environment variables are available
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 0d2190e6794df81f3cf3b84707ce3abdf5843100
Component: engine
2015-03-24 18:29:21 -07:00