ea26fe641c
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
Upstream-commit: e589dc7424dfad993f1fc646b66fa04306a2df2d
Component: engine
2015-03-25 16:24:57 -07:00
6340350f2f
Merge pull request #11745 from imdreamrunner/patch-1
...
Add missing newline for bash code example
Upstream-commit: 8d62e12f4dfdbe795cae1a4bf4571aae3ea6b6ea
Component: engine
2015-03-25 16:58:55 -06:00
c24a1cf195
Fix typo "WRKDIR" -> "WORKDIR"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6fdb583f3899362db13292ad3cad31fec970d638
Component: engine
2015-03-25 23:47:38 +01: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
d4497c7a2b
.: remove trailing white spaces
...
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
f7a30f1c84
Add missing newline for bash code example
...
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com >
Upstream-commit: ed7907a988fe336711603e38c8b79d673e87c902
Component: engine
2015-03-26 01:24:00 +08:00
abd71318ca
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06: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
d00e59a1a0
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
Upstream-commit: 322095ed63ec0943378485f8f8d4cabcfd471875
Component: engine
2015-03-24 16:02:14 -07:00
82a679e32d
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
Upstream-commit: a4e1de58a3019e7ab9e143af3243713f0e80fe15
Component: engine
2015-03-24 14:42:02 -07:00
d83a675d7e
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
Upstream-commit: a153e80f72274c05589145011c16cc1d7f8ee75f
Component: engine
2015-03-24 15:33:53 -06:00
0b59de6c55
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 6de806f348cf802e80a729f390bab777df146ca7
Component: engine
2015-03-24 11:25:26 -07:00
f56d95c837
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
Upstream-commit: 4b4bdb5be58943c24ca64fd8b0b69cd259515a23
Component: engine
2015-03-24 09:17:41 -07:00
5748e209c9
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
Upstream-commit: dbd00822ece83b614ec92454bc8e20b5238ccb4d
Component: engine
2015-03-24 09:13:53 -07:00
dca8944dc0
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
Upstream-commit: d827b4d235f7604e2a4fa7ad95e2d75dafb4ac27
Component: engine
2015-03-24 09:12:00 -07:00
8deca36145
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
Upstream-commit: 05c23cad85bde1d76ccd1d398f5a839ee8ee87d9
Component: engine
2015-03-24 06:28:24 -07:00
c7b0d94a4d
add cpuset and examples to run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: a5cbb5c3aec0d5c717581b2b60b9ae89b2c6fd05
Component: engine
2015-03-24 18:48:08 +08:00
0b2b56ecf5
Add documentation about the semantics of docker login
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com >
Upstream-commit: ed0d2ac3b799b8f7b2508176e65bfe8583881c83
Component: engine
2015-03-23 23:53:50 -07:00
5ae0277137
docs: add memory and swap memory usage examples
...
fix: https://github.com/docker/docker/issues/11629
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 0f9c20fe688e0bc093f631b7d31badc4bb750bd7
Component: engine
2015-03-24 13:45:16 +08:00
77de545445
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
Upstream-commit: 617f18b0011b45a9ef71d4adb45b3ca45132e1e6
Component: engine
2015-03-23 21:36:40 -07:00
6fc2c6927a
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: df98ce0a28c6d38757305dccc1acb4b8989e6aff
Component: engine
2015-03-23 21:12:09 -07:00
616291f1ff
Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
...
Signed-off-by: Dan Anolik <dan@anolik.net >
Upstream-commit: a57d7c5c796a1affcfa05ee6e7ea586750a9292f
Component: engine
2015-03-23 20:47:04 -07:00
6609e10340
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com >
Upstream-commit: 6fa6b5bcbb707a1fe709c5272035b79635c29a78
Component: engine
2015-03-23 23:45:55 -04:00
7c33403b52
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com >
Upstream-commit: ef0275c66c420944dd3de4647d2d25b78f8f1b5a
Component: engine
2015-03-23 20:16:40 -07:00
5367fab1f0
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
Upstream-commit: b21751da907cb2889aa9ca95ebf6c4c66e6131a6
Component: engine
2015-03-23 19:22:17 -07:00
5715097ddd
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com >
Upstream-commit: 841692ff864c0d71347607eb8e4fbcf826d859c0
Component: engine
2015-03-23 19:00:05 -05:00
05267b46bc
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com >
Upstream-commit: fe1f5ac77cda335ee773956cc8683a0c31791c3c
Component: engine
2015-03-23 23:05:57 +00:00
dad3640059
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
Upstream-commit: 65e21f570358f46f6ad0f8fa2cd3394706ba169d
Component: engine
2015-03-23 11:34:33 -07:00
69bd180001
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
Upstream-commit: 61966d281bb715a2359b27bcd30d0d59c98d2812
Component: engine
2015-03-23 13:30:11 -05:00
088f0e2cb3
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
Upstream-commit: 45ee402a631a59e2a33df7b2f63a49f6f3f84f09
Component: engine
2015-03-22 19:16:23 -07:00
d411e326ae
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
Upstream-commit: 0b63b343e8cb83d21c9de5d986b0a4ae01fb4646
Component: engine
2015-03-22 19:14:34 -07:00
0485dd2e93
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
2015-03-22 19:13:38 -07:00
7cd85af5c7
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Reolved conflict in:
docs/mkdocs.yml
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
2015-03-22 18:19:27 -07:00
7d0f834cb3
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
Upstream-commit: cce196d64b50384a71a0fbf1f1026e8580ff9d15
Component: engine
2015-03-23 11:01:28 +10:00
2b2e612495
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
Upstream-commit: cf7d093e17d89371cf375a5f66e8103d7dde6e3c
Component: engine
2015-03-23 10:03:00 +10:00
e1ebdbecb2
Updating in light of new contributors guide
...
Link to new guide. Added a quickstart contributor guide for experienced people.
Converting narrative style to procedures for easier use. I think there is something missing in the
release publishing section...but it looks like it was missing in the original.
Updates per thaJeztah
Edits per Fred
Updating with comments from Sven
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: fdbec264111ac20b06cdd9b885fe47415a6495e4
Component: engine
2015-03-22 11:55:32 -07:00
9e9a6a8f56
Fix typo in git setup doc.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: f5c60fc0fd4e0daa068134ab9a887f69c797bae7
Component: engine
2015-03-22 11:22:47 -04:00
7c1bfa9093
Implement build cancellation
...
Add the capability to cancel the build by disconnecting the client.
This adds a `cancelled` channel which is used to signal that a build
should halt. The build is halted by sending a Kill signal and noticing
that the cancellation channel is closed.
This first pass implementation does not allow cancellation during a
pull, but that will come in a subsequent PR.
* Add documentation of cancellation to cli and API
* Protect job cancellation with sync.Once
* Add TestBuildCancelationKillsSleep
* Add test case for build cancellation of RUN statements.
Signed-off-by: Peter Waller <p@pwaller.net >
Upstream-commit: 671c12204cb469d868f646da1474d5bad6541770
Component: engine
2015-03-22 11:31:28 +00:00
d2583ecaca
Clarifying structure in light of Kitematic
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: f3b7bf9682c10cdd6dfbdca79080790d7411c1b7
Component: engine
2015-03-21 18:20:25 -07:00
a7d21898b0
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com >
Upstream-commit: eaecd8b1b5871a4d17be27e3615106587eec1d3a
Component: engine
2015-03-21 18:01:18 -07:00
3e6a579992
Update contributor docs and triage to match new labeling system
...
Add clarification around experience
Adding test
improvement > enhancement
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3ff9991bb27b238b0df4f67b6714174ca92223eb
Component: engine
2015-03-21 15:55:33 -07:00
490a18c994
Fix some escaping around env var processing
...
Clarify in the docs that ENV is not recursive
Closes #10391
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6d66e3e7a5ecb021a9e89c4f85fadecf23e2000c
Component: engine
2015-03-20 20:09:00 -07:00
e8bf8127c1
docs: cli: reorder rename command to be in alphabetical order
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
Upstream-commit: fe21c7a4bebd5d6d0065e0529d03a03723fc697b
Component: engine
2015-03-20 14:51:39 -07:00
7772935737
updated text
...
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
2015-03-20 14:44:24 -07:00
f8785b1704
Merge branch 'master' of github.com:docker/docker into joyentinstall
...
Resolved conflict in the following file:
docs/sources/installation/MAINTAINERS
File was deleted upstream and changed in this branch. Deleting the file in this branch as well.
Signed-off-by: Casey Bisson <casey.bisson@joyent.com >
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
2015-03-20 14:37:17 -07:00
50fc694c96
Merge pull request #11481 from jfrazelle/perms-on-release
...
cleanup docs/release.sh
Upstream-commit: d2cb3af75b5c8597be5cddfe15f1002f482870cf
Component: engine
2015-03-20 10:57:43 -04:00
40e97918dc
docs: Add Azure installation instructions
...
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 72fa3fcaeacfcfebdad463d965ff1d6a3e95d516
Component: engine
2015-03-19 21:28:29 -07:00
12a935da06
Small copy edits
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 32efa559a3b643df117222e998b2d9ab550b0060
Component: engine
2015-03-20 14:09:30 +10:00
