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
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
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
b6cc2868a6
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)
Upstream-commit: 844c0f154abff1fc6e9e3907b23d1f3d99b0e840
Component: engine
2015-03-19 21:07:02 -07:00
5e34656977
Merge pull request #11470 from albers/events-filter-name
...
Remove 'name' filter from docker events documentation
Upstream-commit: f574262ff74126f080a7e9bd16f0e4017761de94
Component: engine
2015-03-19 16:22:30 -07:00
2c047d4fdf
Merge pull request #11479 from falmp/patch-1
...
Fixed --read-only description indentation
Upstream-commit: 0d3da36a5f4362a0e5907d3d0a69ac66ded6b04f
Component: engine
2015-03-19 16:22:08 -07:00
586d8f70ba
Merge pull request #11498 from jbnunn/patch-1
...
Typo/grammar corrections to dockerizing.md
Upstream-commit: fcc87c0df0c3d5da72786db2df9dc6b4ed090a08
Component: engine
2015-03-19 16:21:29 -07:00
a5bb86caaa
Merge pull request #11428 from vishh/parent-cgroup
...
Adding '--cgroup-parent' option.
Upstream-commit: 455a272aef4e109ce57c20f9ea224e4d4b32ece7
Component: engine
2015-03-19 14:41:57 -07:00
b2e6c9b566
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 >
Upstream-commit: 6ca1494f1932b66e042263999d8afd90e184ebf8
Component: engine
2015-03-19 13:59:40 -07:00
cacba6788c
Optimize images
...
Optimized new screenshots, reduced file-size with 50%
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: cf0634b937264afd1194600f3719d35f29ac0440
Component: engine
2015-03-19 10:01:43 -06:00
cc2fb5cc3f
Update docs around private github submodules in automated builds.
...
Signed-off-by: Jeff Anderson <jeff@docker.com >
Upstream-commit: 390dd4bf3f6e3c6b239d597467554a19b04dc89d
Component: engine
2015-03-19 10:01:43 -06:00
627077c4f9
Typo/grammar corrections to dockerizing.md
...
Added commas where necessary, edited typos to improve readability.
Signed-off-by: J. Nunn <jeffnunn@amazon.com >
Upstream-commit: a8faba021c569a53f03ed68b27d2f53db2d70f3d
Component: engine
2015-03-19 10:51:12 -05:00
a94170b2cb
Fixed --read-only description indentation
...
The wrong indentation was breaking documentation layout with code blocks.
Signed-off-by: Francisco Lopes <chico.lopes@gmail.com >
Upstream-commit: b311066d240e6f034c8a5749f01897739f26c7bb
Component: engine
2015-03-19 11:53:50 -03:00
07ba863c0f
Remove 'name' filter from docker events documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ec7530afde3f45a31d51abe17f602a3c5dc6389e
Component: engine
2015-03-19 08:51:36 +01:00
a7ed4dc483
Merge pull request #11028 from jstangroome/patch-1
...
Correct IP/MAC address generation docs
Upstream-commit: 33bec0a7f63695d6fa60a79c8732d49623d30223
Component: engine
2015-03-19 01:44:43 -04:00
b21852214d
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: c7267017e931cee8ecd0e8d88473f26a80a3314c
Component: engine
2015-03-19 02:34:42 +00:00
8bcedc4b44
Adding documentation for '--cgroup-parent' option.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
Upstream-commit: f7dd1333b5a6dfa34ce8b2fb15533f1aca6efdc3
Component: engine
2015-03-19 02:34:15 +00:00
793cdf14d1
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
Upstream-commit: 2cde817458a6ff3d371406cf226552fbd4fd3de9
Component: engine
2015-03-18 21:44:21 -04:00
5e80a64076
Allow setting resource constrains for build
...
Closes #10191
Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e6ae89a45a699bd44f03517396777e34ec76018b
Component: engine
2015-03-18 20:57:13 -04:00
30161bd9a1
Merge pull request #11452 from jeffdm/master
...
Adding Kitematic link to Mac OS X install instructions in docs
Upstream-commit: 068d343ddfad23ca2f7b407f5be03803029ac311
Component: engine
2015-03-18 17:32:48 -07:00
545bbe667a
Adding Kitematic link to Mac OS X install instructions
...
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com >
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
2015-03-18 16:32:59 -07:00
a0dccb769e
Merge pull request #11328 from jfrazelle/fix-docs-release-script
...
Fix clear cache docs release.
Upstream-commit: 42f5c874254798c2e2bc8060939e48ade5c97e23
Component: engine
2015-03-18 16:06:27 -07:00
47d9382364
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
Upstream-commit: 8ec4e698395fb18ed6a6ec1f17798bc05230f0fa
Component: engine
2015-03-18 19:04:43 -04:00
