aa1b60b2be
Updating after the pr went through
...
Updating with comments.
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 3ce27975413a06a76dbdf720aadecf7f04fb6bba
Component: engine
2015-06-01 09:20:31 -07:00
7716bbfe5b
Fix spelling mistakes in documentation
...
While reading some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings ) on markdown files
Signed-off-by: Joe Gordon <joe.gordon0@gmail.com >
Upstream-commit: 3d87b80b46d45c2ca7c0fbcbcbb3fcf97a48444b
Component: engine
2015-05-31 11:53:23 -07:00
f605824756
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
Upstream-commit: f2154a5a6b2d68258322a9a0677e14b910e7b47d
Component: engine
2015-05-30 19:49:38 +02:00
cc848c594e
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
2015-05-30 07:48:46 -07:00
3babe9504e
Premature newline insertions
...
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: e51b3111299bb854b0eb59a26884822e59e09903
Component: engine
2015-05-30 04:46:24 -07:00
4d18604a08
Merge pull request #13561 from icecrime/warn_overlay_docs
...
Add note about overlay not being production ready
Upstream-commit: 1613897d2dcc875096eac669532643b8d2c0c1f0
Component: engine
2015-05-30 01:24:02 +02:00
eafc23fd4d
Add note about overlay not being production ready
...
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 67cb748e26c3b6979983493f307a38b59e291642
Component: engine
2015-05-29 13:53:09 -07:00
b652716d1c
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
Upstream-commit: f1fed87fc01c31114b78a6ca9f7060fc93480957
Component: engine
2015-05-29 10:21:57 -07:00
5efbaa4c3a
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
Upstream-commit: 7317b84ce0fd85c8ab2e6c1dda07567225299805
Component: engine
2015-05-28 15:51:06 -07:00
8d306cf8a5
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: e8c88d253337776a6075c9db69140ce2c5014622
Component: engine
2015-05-29 00:42:11 +02:00
c7b23d13f1
Add comment about ulimit format.
...
Fixes #12116
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9292859fcef2306caeb494ee0eaf0ef98aa190d6
Component: engine
2015-05-28 14:14:07 -07:00
a4f1a75c45
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
Upstream-commit: b4a52fc4e9b8ed745eb012ba45628cdb3654ed70
Component: engine
2015-05-27 15:07:57 -07:00
1adf295b9a
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 160dc79db095767de74deb75b8e1ae86f213593c
Component: engine
2015-05-27 12:50:16 -07:00
d89704cf56
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5929b038816d8bd18d462a19e571c99.
Signed-off-by: Jessica Frazelle <princess@docker.com >
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
Upstream-commit: 40b71adee390e9c06471b89ed845132b4ec80177
Component: engine
2015-05-26 14:12:16 -07:00
691314940f
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
Upstream-commit: 5f57143b3149520842c02bbdbfe03dfc61b0e6f2
Component: engine
2015-05-25 18:07:19 +02:00
e901db1c34
Markdown changes (thanks to runcom for the rebase+squash handholding)
...
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com >
Upstream-commit: 02405a96b2ace7bf34fa9e0628892e4a707bed4d
Component: engine
2015-05-25 17:24:41 +02:00
4b9ff49cd8
doc: cli images examples rm "| head".
...
It's a given that lines of example output might be truncated or come
from a contrived environment.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
Upstream-commit: ca23ac37efe4b8785751f95d5c09c94811a43ed3
Component: engine
2015-05-24 14:04:13 -07:00
7f98a41593
root dir for execdriver (/var/run/docker) should be configurable
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 8b2c6cb0729eadb09d688241e0f5debf1d5ccb0b
Component: engine
2015-05-15 09:30:36 -04:00
dc9bbf77b5
Add --uts=host to allow sharing the UTS namespace
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
2015-05-13 17:56:32 -07:00
c0a71ed02d
Merge pull request #13127 from shishir-a412ed/exec_opt_doc
...
Missing exec-opt[] option in CommandLine docs
Upstream-commit: 5bf2ebf0a5d6eb9043d32dfcee7a4c8beb4e4a7f
Component: engine
2015-05-12 11:34:51 -07:00
b60e82567d
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
Upstream-commit: d0459abe6e29548c6df045483f08797840620b0a
Component: engine
2015-05-12 09:40:16 -04:00
5a91f639c0
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
Upstream-commit: e7568ed227908c3470b6a341ed24c05ca486368d
Component: engine
2015-05-11 16:53:17 -07:00
84543fc3ec
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
Upstream-commit: 8cc93856e37f045060cce5345e28421514ba7833
Component: engine
2015-05-11 13:18:29 -07:00
60d5f903de
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c6e6223ed735b4ff6a15f5d5716376d765f60b09
Component: engine
2015-05-11 21:50:47 +02:00
7820b09f20
Missing exec-opt[] option in CommandLine docs
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 98277f3cad55e68aa730ba40cb375b268ee794e6
Component: engine
2015-05-11 15:41:50 -04:00
365c18080f
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: cb9a6b9aed1577bb5590300125d05d9b1c201c16
Component: engine
2015-05-10 20:42:14 +00:00
560ba9b809
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: dccb8b5c339e218222bae4ce74bbeccb9e020c82
Component: engine
2015-05-09 10:02:46 +08:00
9c30c1f4a1
docs: move zfs.fsname option to storage option section
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: bdf784ae4ae62a560f28e974ff9b9c26aaf8a533
Component: engine
2015-05-08 17:48:20 +02:00
e5820ed7e4
Implement Docker on ZFS
...
Signed-off-by: Arthur Gautier <baloo@gandi.net >
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
Upstream-commit: d5151ca8ab5d90300839c8572cb96577de4d6233
Component: engine
2015-05-08 17:48:20 +02:00
5c2686119c
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
Upstream-commit: de32f5c431bbdb56d6a446af0e5660fae9539bd8
Component: engine
2015-05-07 17:10:39 -07:00
2ee6387cbc
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
Upstream-commit: 74bfa3675353aaf10ca760e82a79d758bea0ff6b
Component: engine
2015-05-07 14:01:16 -07:00
4f3515319b
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f133f11a7d25e6262558dd733afaa95ddd1c7aee
Component: engine
2015-05-07 11:55:58 +08:00
f6876820fd
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
Upstream-commit: e960e4bb129de15b3beb7da37421e32af8dccf2f
Component: engine
2015-05-05 14:46:47 -07:00
da6438ab18
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
Upstream-commit: 91fb4d672a8536d2f0437aeeb2dfc7b9e51aac16
Component: engine
2015-05-04 22:28:01 -07:00
d7e8665b03
Add --userland-proxy daemon flag
...
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.
Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: f42348e18f73d1d775d77ac75bc96466aae56d7c
Component: engine
2015-05-04 16:07:45 -07:00
f81d4d4161
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
Upstream-commit: 0a2ccb1cb54834d3b97982f93c42671be5861082
Component: engine
2015-05-04 12:48:24 -07:00
a0ae4df58b
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 49fd83a25e2e6604014de41d4f4099a7bc07a09b
Component: engine
2015-05-04 09:28:06 -07:00
9531505238
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: f3023a93d1a0a96a7312de441a550c758ac0c17d
Component: engine
2015-05-04 10:49:13 -04:00
ad3d66108b
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a4a924e1b6c50f0f02460489259d73468a6c282e
Component: engine
2015-05-04 21:11:29 +08:00
ce3a344378
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
Upstream-commit: 53bef64804c6dae6662a7d55c3bb3e48b3e5dfdf
Component: engine
2015-04-29 10:00:41 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
1a116000d5
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
2015-04-27 17:50:39 -07:00
7b559d4a5f
Add docs for --exec-opt and setting native.cgroupdriver.
...
update man pages.
update bash completion.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d4bbbe58ddd5916c5f7d253a90fd97e3a4fd59bf
Component: engine
2015-04-27 17:04:28 -07:00
b3b4c052f9
Make the docs for --cgroup-parent better
...
Signed-off-by: Marianna <mtesselh@gmail.com >
Upstream-commit: a8dfafc98642455ed83f9422f3174fa828dde4df
Component: engine
2015-04-25 16:35:28 -04:00
9f2b2b3d39
Adding doc
...
Signed-off-by: Julien Barbier <write0@gmail.com >
Upstream-commit: 81897adcee8813efdff8374a1f46125b7e094847
Component: engine
2015-04-25 15:25:51 -04:00
ecfd095619
Document the extra depth argument in git contexts.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 8bd5a95e1e39541dfc5dc635c5c8e7604fe10028
Component: engine
2015-04-24 09:39:39 -07:00
701a9fb9a1
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl >
Upstream-commit: 63593267619378520a03e8984c5fcf0ec8957537
Component: engine
2015-04-23 07:41:30 +02:00
60a0268238
Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
...
Remove some unsupported instructions in the docs.
Upstream-commit: 21c8d211e1bd508091c1dfecb29a32988ac2a17a
Component: engine
2015-04-21 14:08:31 -07:00
cff18dc122
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
Upstream-commit: 17d5450bc31e81c22e8ccba806294e4d744af275
Component: engine
2015-04-20 17:55:01 -07:00
23af23a14a
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
Upstream-commit: 47b703593efa10489f39b2396081fa65d12ccae4
Component: engine
2015-04-20 17:28:24 -07:00
