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
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
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
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
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
Sebastiaan van Stijn
cf0634b937
Optimize images
...
Optimized new screenshots, reduced file-size with 50%
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-03-19 10:01:43 -06:00
Jeff Anderson
390dd4bf3f
Update docs around private github submodules in automated builds.
...
Signed-off-by: Jeff Anderson <jeff@docker.com >
2015-03-19 10:01:43 -06:00
J. Nunn
a8faba021c
Typo/grammar corrections to dockerizing.md
...
Added commas where necessary, edited typos to improve readability.
Signed-off-by: J. Nunn <jeffnunn@amazon.com >
2015-03-19 10:51:12 -05:00
Harald Albers
ec7530afde
Remove 'name' filter from docker events documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-03-19 08:51:36 +01:00
James Turnbull
33bec0a7f6
Merge pull request #11028 from jstangroome/patch-1
...
Correct IP/MAC address generation docs
2015-03-19 01:44:43 -04:00
Vishnu Kannan
c7267017e9
Adding integration tests for --cgroup-parent feature.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2015-03-19 02:34:42 +00:00
Vishnu Kannan
f7dd1333b5
Adding documentation for '--cgroup-parent' option.
...
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com > (github: vishh)
2015-03-19 02:34:15 +00:00
Doug Davis
2cde817458
Merge pull request #11410 from cpuguy83/10191_build_resources
...
Allow setting resource constraints for build
2015-03-18 21:44:21 -04:00
Brian Goff
e6ae89a45a
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 >
2015-03-18 20:57:13 -04:00
moxiegirl
068d343ddf
Merge pull request #11452 from jeffdm/master
...
Adding Kitematic link to Mac OS X install instructions in docs
2015-03-18 17:32:48 -07:00
Jeffrey Morgan
3ddf5d7517
Adding Kitematic link to Mac OS X install instructions
...
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com >
2015-03-18 16:32:59 -07:00
Tibor Vass
8ec4e69839
Merge pull request #11430 from jfrazelle/export_outputflag
...
Modified `docker export` to allow an --output flag
2015-03-18 19:04:43 -04:00
moxiegirl
50bf3cbedc
Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144
...
Clarify behavior of docker cp
2015-03-18 08:46:52 -07:00
Sebastiaan van Stijn
4e6a01023b
cleanup: docs: remove temporary inline styles
...
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868 ).
This removes those temporary `<style>` tags.
depends on #11230 (https://github.com/docker/docker/issues/11230 )
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-03-17 22:48:28 +01:00
Mary Anthony
f60ed98e79
# This is a combination of 2 commits.
...
# The first commit's message is:
Updating Ubuntu installation to use wget; eliminating elo
Signed-off-by: Mary Anthony <mary.anthony@docker.com >
# This is the 2nd commit message:
Adding in James comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-03-17 10:15:46 -07:00
moxiegirl
2ab105e9fe
Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882
...
Return of the Ring: Metadata Labels Doc Tweaks
2015-03-17 09:47:36 -07:00
Arnaud Porterie
1ff5a91007
Merge pull request #10568 from LK4D4/logging_drivers
...
Logging drivers
2015-03-17 09:45:58 -07:00
Andy Goldstein
a2b0c9778f
Add ability to refer to image by name + digest
...
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.
Signed-off-by: Andy Goldstein <agoldste@redhat.com >
2015-03-17 10:10:42 +00:00
Joseph Kern
5ff122f797
Modified docker export to allow an --output flag
...
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added an --output flag to docker export and created tests.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net > (github: jfrazelle)
checkpoint before edits on the export functions
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
White space cleanup.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added text to reflect a new output option for the export command.
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Whitespace clean up
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
Added man page documentation for the new --output flag in export
Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com >
2015-03-17 00:20:19 -07:00
Mary Anthony
6ddfe883dd
Updating with Sven's comments and other tweaks
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-03-16 21:49:33 -07:00
Arnaud Porterie
b6ac111abf
Merge pull request #9882 from ibuildthecloud/labels
...
Proposal: One Meta Data to Rule Them All => Labels
2015-03-16 20:20:05 -07:00
James Turnbull
97a5c584b3
Merge pull request #11429 from tianon/eval-shellinit
...
Add "eval" to every invocation of "boot2docker shellinit"
2015-03-16 21:19:50 -04:00
Jessie Frazelle
da24ba42e2
Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference
...
docs: use more tables in run reference and minor fixups
2015-03-16 18:02:42 -07:00
Michael Crosby
e6b18cb66d
Merge pull request #11210 from xuhdev/patch-1
...
Update doc: "docker create" must specify a command
2015-03-16 17:43:17 -07:00
Tianon Gravi
200123b317
Add "eval" to every invocation of "boot2docker shellinit"
...
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-03-16 18:27:59 -06:00
Jessie Frazelle
44e9715e46
Merge pull request #10723 from SvenDowideit/takeover-10653
...
Update sample systemd for container
2015-03-16 17:18:57 -07:00