bbca49004b
Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
...
Fixing dangling link in docs/reference/commandline/run.md
Upstream-commit: 490e78a642492f25d6c0f7cf1ee855b192d323c7
Component: engine
2015-07-23 16:29:17 -07:00
bf29f91881
Merge pull request #14589 from paetling/ae-update_net_docs
...
add to docs that ports do not get exposed when using --net
Upstream-commit: ae027c08642621877a93187c0f2b0451df8b71fd
Component: engine
2015-07-23 16:22:21 -07:00
6a78a43641
Merge pull request #14900 from duglin/AddFilterToDoc
...
Add filter to /images/json docs
Upstream-commit: 4e035031b03da375a58bac2263a5eff8ea1acf1a
Component: engine
2015-07-23 11:57:12 -07:00
b1387e7404
Add filter to /images/json docs
...
Closes #14894
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a20bf5e61c542fea377345d5318293b44c65cbb5
Component: engine
2015-07-23 05:29:09 -07:00
f367cae014
Fix typo in builder.mb .dockerignore example
...
Signed-off-by: jgeiger <jgeiger@gmail.com >
Upstream-commit: 9086c16f4283e330361ec9621781f6315fe3467f
Component: engine
2015-07-22 23:54:46 -06:00
c3fd734293
Merge pull request #14886 from duglin/FixDepDoc
...
Fix typo in deprecation doc
Upstream-commit: c5053d4700379e6bd46b498b8559f5be88c8c1a2
Component: engine
2015-07-22 23:15:09 -04:00
b278b668e9
Add ulimit to docker build.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 877dbbbde8aaf6583a81d9946e4c83db8e356b1a
Component: engine
2015-07-23 10:26:06 +08:00
6983345fdd
Fix typos in deprecation doc
...
thanks @tiborvass
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: ea3dcee913d5c76984354340239f97a725035e88
Component: engine
2015-07-22 18:45:12 -07:00
6f661b9f5c
Merge pull request #14580 from rohitkadam19/patch-1
...
Update docker_remote_api_v1.17.md
Upstream-commit: a3857cc3799e2a92b92f07842c03b442490f01ab
Component: engine
2015-07-22 19:22:37 -04:00
8cd4fb4243
Merge pull request #14638 from jfrazelle/new-repo-install-script
...
update install script/docs for new apt and yum repos
Upstream-commit: f21819275470b8a3ec6915fa59f386be44371356
Component: engine
2015-07-22 15:25:27 -07:00
56865b2a68
update docs for new install script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 877d740d4837c67030458254db80aea3869989b1
Component: engine
2015-07-22 15:08:14 -07:00
4ecc8c2651
Define Docker's deprecation policy
...
Announce the cmd line options that are targetted for removal
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 27b828c9e4430e432380bae4962a366c22228823
Component: engine
2015-07-22 14:09:49 -07:00
0f4c6539ee
Merge pull request #14769 from clintonskitson/add_plugindocs_rexray
...
updated plugin docs to include REX-Ray
Upstream-commit: d3ba2457d92e0aa763723d632ec9ac9048aa66b9
Component: engine
2015-07-22 22:12:41 +02:00
90d69c37a6
Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize
...
Docs: update the devicemapper default basesize from 10G to 100G
Upstream-commit: 933d9f2e0d61345a11f272487a223f4085bb798a
Component: engine
2015-07-22 22:07:38 +02:00
ec7391b794
Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
...
Refactor log driver reader
Upstream-commit: 1c6fe58efc413b606b6b24e42584ca14be2d1ca8
Component: engine
2015-07-22 11:54:35 -07:00
b066063905
Merge pull request #14699 from estesp/docker-ps-format
...
Carry #10255 : Docker ps format
Upstream-commit: 40b922418cd48f8b414d8e10fdd72ed2095697e1
Component: engine
2015-07-22 10:58:34 -07:00
e60763fbc1
ps --format: Add config.js doc, fix gofmt, add integration tests
...
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
2015-07-22 12:51:16 -04:00
6fe7577ea8
Merge pull request #14217 from ankushagarwal/ubuntu-15.04
...
Add support for 15.04, add systemd note for 15.04
Upstream-commit: 7d8859a4f54ce86b368860890f9167b910827023
Component: engine
2015-07-22 08:56:02 -07:00
2d8d0361a7
Merge pull request #13711 from calavera/version_volumes_inspect
...
Expose new mount points structs in inspect.
Upstream-commit: 50d2597e490c4636ee8cacabf34bb9ed3e21d3fc
Component: engine
2015-07-22 09:02:00 +02:00
571c42191c
added REX-Ray as volume plugin to plugin docs
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
Upstream-commit: ca552a953e0b7551f710b102454baefd3c450122
Component: engine
2015-07-21 21:00:27 -05:00
5104b34c44
Split reader interface from logger interface
...
Implement new reader interface on jsonfile.
Moves jsonlog decoding from daemon to jsonfile logger.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c0391bf5545afef5e675138556c39e4c0e9bf91b
Component: engine
2015-07-21 20:47:31 -04:00
b821d19c27
Expose new mount points structs in inspect.
...
Keep old hashes around for old api version calls.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1c3cb2d31ea722e2c174bf78eda62fec6949fb8b
Component: engine
2015-07-21 15:33:05 -07:00
b4919d1406
docs: Updated for docker cp and its API changes
...
Documented changes to API to enable new `docker cp` behavior.
Added documentation on `docker cp` usage and behavior.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: e54b1e081ae15a71e758f7d2691dc2bff3f66e02
Component: engine
2015-07-21 15:30:20 -07:00
c56394846e
Merge pull request #14659 from calavera/promote_volumes_experimental_to_master
...
Promote volume drivers from experimental to master.
Upstream-commit: 3ee15acaadc3f25c90ea2c4de2e5ab1a12d8e042
Component: engine
2015-07-21 10:39:17 -07:00
bfde6861a0
Promote volume drivers from experimental to master.
...
Remove volume stubs and use the experimental path as the only path.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: c4d45b6a29a91f2fb5d7a51ac36572f2a9b295c6
Component: engine
2015-07-21 09:32:44 -07:00
46bf07aaed
Merge pull request #14725 from charleswhchan/issue-14433
...
Issue #14433
Upstream-commit: 1ca737875d88384cfa3f36732b977ce07f60126a
Component: engine
2015-07-21 07:48:54 -07:00
d7cb201163
Merge pull request #14731 from Evalle/14729-Fix-ubuntu-doc-issue
...
Fixing ubuntu doc issue
Upstream-commit: 739f7b1da65661123e5ad12e200c887a13c2d34d
Component: engine
2015-07-21 15:51:11 +02:00
72f5aa2fcc
Docs: update the devicemapper default basesize from 10G to 100G
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 36cc6a985be61cdcd9356385bc722c5ccad636b9
Component: engine
2015-07-21 20:46:31 +08:00
320928e0b8
Merge pull request #14727 from vdemeester/opts-docs-updates
...
Update documentation according to opts updates (#13694 )
Upstream-commit: 1e9394103c9dee8fb363ac37695775fbc61b9c2d
Component: engine
2015-07-21 14:19:29 +02:00
5a80e110cb
Update documentation according to opts updates
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: dc8b765930168bbdce1189b702050b5a020c15af
Component: engine
2015-07-21 14:08:19 +02:00
cbb8acf897
Merge pull request #14766 from runcom/remove-ref-from-libcontainer
...
Remove reference to docker/libcontainer
Upstream-commit: 197c9010bc0ea2cfab444f68247776391f471730
Component: engine
2015-07-21 12:49:36 +02:00
6c8aab1b9c
Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin
...
Add gradle docker remote api plugin
Upstream-commit: f0473eaf01002263f59139716a018d267c1bd6f1
Component: engine
2015-07-21 08:34:08 +02:00
63185229e8
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
Upstream-commit: 8b7923620ac5f7a40806e2ed22616231a5965b14
Component: engine
2015-07-21 00:23:56 +02:00
c8933bf1c2
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
Upstream-commit: 6609cfb5e743b67e21c60296b0edda643551aa3b
Component: engine
2015-07-20 11:59:48 -07:00
09a470656b
Remove reference to docker/libcontainer
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 691e3a3e7070ca43a9ad8f5f99c2563ccdce98a5
Component: engine
2015-07-20 20:30:22 +02:00
da9ff50d73
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 6f8ddec1d0e67058c7a4a15c7d4d9a75bc1e5dea
Component: engine
2015-07-20 16:10:10 +08:00
691236dacd
Add support for 15.04, add systemd note for 15.04
...
Fixes #12002
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 9847c0c8b0409d85a1f79a8d7316ba48d6a3ef9a
Component: engine
2015-07-19 18:33:55 -07:00
e8c2670622
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: e0bceb70647499ec3660204731a1b42ced927492
Component: engine
2015-07-19 15:39:43 -07:00
6212ad7f28
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
Upstream-commit: ccc78c9968b6cfd6cdf85c28953453c2cd0aa95b
Component: engine
2015-07-19 13:00:50 -07:00
d824694b36
add gradle-docker-plugin, update docker-client url
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: a51684ff8f44a8c54a8724847fe345487f478d14
Component: engine
2015-07-19 21:28:11 +02:00
e480c92f68
remove unused row-even and row-odd css classes
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 38e7069668e4a690bd47108db26f8d6f9966e414
Component: engine
2015-07-19 21:27:12 +02:00
c651defcad
Issue #14433
...
Try to improve the cache behavior for `ADD` and `COPY` commands.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: 08d5424c049dd67119cf0019ccb7fbc58bf27ec2
Component: engine
2015-07-19 12:19:28 -07:00
a68f23c05d
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
Upstream-commit: 32764fe3b907dfe4d3e833c19fc605859adba47e
Component: engine
2015-07-19 06:53:25 -07:00
46887eda31
Fixing ubuntu doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
Upstream-commit: 120c21c97c5cb83bc2384d3b76faf949c67db0a2
Component: engine
2015-07-18 18:24:45 +02:00
2138eae5bf
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
Upstream-commit: a89370039a65f235d3dde5d36f20d0f463c615e9
Component: engine
2015-07-18 11:14:28 +02:00
428f8fb7db
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 340bd135ddf9a053dc6106a874e70e021a9e6acb
Component: engine
2015-07-17 14:04:19 -07:00
c4955551ce
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
Upstream-commit: 415f744d0c5980d332ab54c80f1521a0e5b4d401
Component: engine
2015-07-17 22:41:26 +02:00
e191f54133
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: ceca4109fac5367f7c354b675cadf086dc1e09c3
Component: engine
2015-07-16 22:49:46 -07:00
89efa010e2
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
Upstream-commit: 8c77e3962777f4f693de7b4b064aac20306e4a4b
Component: engine
2015-07-16 18:32:56 +02:00
abf0842b64
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 081991c01e13c60af725bea91c4f5598dbcceaa9
Component: engine
2015-07-16 08:23:55 -07:00
