Tibor Vass
0252ad0adc
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 4e65c1c319
.
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-03-25 10:04:56 -06:00
moxiegirl
dea660874c
Merge pull request #11715 from duglin/DocCliEnvVars
...
Add some info about what environment variables are available
2015-03-25 07:29:27 -07:00
moxiegirl
67eb10defe
Merge pull request #11694 from hqhq/hq_add_memsw_example
...
docs: add memory and swap memory usage examples
2015-03-25 07:01:44 -07:00
Doug Davis
0d2190e679
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>
2015-03-24 18:29:21 -07:00
Arnaud Porterie
322095ed63
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
2015-03-24 16:02:14 -07:00
Alexander Morozov
a4e1de58a3
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
2015-03-24 14:42:02 -07:00
jimmyxian
a153e80f72
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-03-24 15:33:53 -06:00
Mary Anthony
6de806f348
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-24 11:25:26 -07:00
moxiegirl
4b4bdb5be5
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
2015-03-24 09:17:41 -07:00
moxiegirl
dbd00822ec
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
2015-03-24 09:13:53 -07:00
moxiegirl
d827b4d235
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
2015-03-24 09:12:00 -07:00
moxiegirl
05c23cad85
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
2015-03-24 06:28:24 -07:00
Qiang Huang
a5cbb5c3ae
add cpuset and examples to run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-24 18:48:08 +08:00
Jesse Dearing
ed0d2ac3b7
Add documentation about the semantics of docker login
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com>
2015-03-23 23:53:50 -07:00
Qiang Huang
0f9c20fe68
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>
2015-03-24 13:45:16 +08:00
moxiegirl
617f18b001
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
2015-03-23 21:36:40 -07:00
Chris Khoo
df98ce0a28
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
2015-03-23 21:12:09 -07:00
Dan Anolik
a57d7c5c79
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>
2015-03-23 20:47:04 -07:00
Swapnil Daingade
6fa6b5bcbb
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com>
2015-03-23 23:45:55 -04:00
Mark West
ef0275c66c
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com>
2015-03-23 20:16:40 -07:00
Chris Khoo
b21751da90
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com>
2015-03-23 19:22:17 -07:00
Jamshid Afshar
841692ff86
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com>
2015-03-23 19:00:05 -05:00
Natalie Parker
fe1f5ac77c
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com>
2015-03-23 23:05:57 +00:00
Alexander Morozov
65e21f5703
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
2015-03-23 11:34:33 -07:00
Tibor Vass
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
Jessie Frazelle
45ee402a63
Merge pull request #9774 from pwaller/cancellation
...
Add basic build cancellation
2015-03-22 19:16:23 -07:00
moxiegirl
0b63b343e8
Merge pull request #11505 from lloydde/doc-ref-run-it
...
doc: reference/run introduce -it .
2015-03-22 19:14:34 -07:00
moxiegirl
0926a023d6
Merge pull request #11550 from moxiegirl/adjust-mac-install
...
Clarifying structure in light of Kitematic
2015-03-22 19:13:38 -07:00
Casey Bisson
a71d89d041
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>
2015-03-22 18:19:27 -07:00
Sven Dowideit
cce196d64b
Merge pull request #10903 from programmerq/docs_submodules
...
Update docs around private github submodules in automated builds.
2015-03-23 11:01:28 +10:00
Sven Dowideit
cf7d093e17
Merge pull request #11400 from ahmetalpbalkan/docs/azure
...
docs: Add Microsoft Azure installation instructions
2015-03-23 10:03:00 +10:00
Mary Anthony
fdbec26411
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>
2015-03-22 11:55:32 -07:00
Raghuram Devarakonda
f5c60fc0fd
Fix typo in git setup doc.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com>
2015-03-22 11:22:47 -04:00
Peter Waller
671c12204c
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>
2015-03-22 11:31:28 +00:00
Mary Anthony
f3b7bf9682
Clarifying structure in light of Kitematic
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-03-21 18:20:25 -07:00
sidharthamani
eaecd8b1b5
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com>
2015-03-21 18:01:18 -07:00
Mary Anthony
3ff9991bb2
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>
2015-03-21 15:55:33 -07:00
Doug Davis
6d66e3e7a5
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>
2015-03-20 20:09:00 -07:00
Todd Whiteman
fe21c7a4be
docs: cli: reorder rename command to be in alphabetical order
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-03-20 14:51:39 -07:00
Casey Bisson
19e3db3503
updated text
...
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939
Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
2015-03-20 14:44:24 -07:00
Casey Bisson
cb2280c98e
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>
2015-03-20 14:37:17 -07:00
Phil Estes
d2cb3af75b
Merge pull request #11481 from jfrazelle/perms-on-release
...
cleanup docs/release.sh
2015-03-20 10:57:43 -04:00
Ahmet Alp Balkan
72fa3fcaea
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>
2015-03-19 21:28:29 -07:00
Sven Dowideit
32efa559a3
Small copy edits
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-03-20 14:09:30 +10:00
Jessica Frazelle
844c0f154a
change perms on release and cleanup docs
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2015-03-19 21:07:02 -07:00
Jessie Frazelle
f574262ff7
Merge pull request #11470 from albers/events-filter-name
...
Remove 'name' filter from docker events documentation
2015-03-19 16:22:30 -07:00
Jessie Frazelle
0d3da36a5f
Merge pull request #11479 from falmp/patch-1
...
Fixed --read-only description indentation
2015-03-19 16:22:08 -07:00
Jessie Frazelle
fcc87c0df0
Merge pull request #11498 from jbnunn/patch-1
...
Typo/grammar corrections to dockerizing.md
2015-03-19 16:21:29 -07:00
Michael Crosby
455a272aef
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
2015-03-19 14:41:57 -07:00
Lloyd Dewolf
6ca1494f19
doc: reference/run introduce -it .
...
Also:
- Fix "docker" cmd always "sudo docker" for docs.
- Fix "-ti" with "-it".
- fix "/docker" typo.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com>
2015-03-19 13:59:40 -07:00