fb0212db59
Merge pull request #17861 from gissehel/apt-source-doc
...
explicit way to express that docker.list are different choices and not just one big file
Upstream-commit: 20905ec452ef0139027c6b0e193dda0d83a59f69
Component: engine
2015-11-20 10:06:13 +01:00
7c1d3da9d9
Small changes to storage driver/commands ref
...
Entering V's comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 9941d5bc33bc50c9e4e1fcba05c0f011bc0ae082
Component: engine
2015-11-19 17:13:23 -08:00
3221274c6e
Merge pull request #18084 from wenchma/18054_exec_start_fix
...
Update docs and test of exec create api return codes
Upstream-commit: 8e6e38990cb09eca2575263240d45a2a55db292e
Component: engine
2015-11-19 13:51:46 -08:00
1d7fc30a8e
allow filtering containers by any status
...
Signed-off-by: Kamil Domański <kamil@domanski.co >
(cherry picked from commit 9ada6a06c57ce4ed4bfad50f603962b7b9ce6fb1)
Upstream-commit: f30364c5835452598e58781f360681f2d77fa16c
Component: engine
2015-11-19 14:11:41 -05:00
7d68517eab
Update docs and test of exec create api return codes
...
Fixes issue #18054
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 01b86d612cba22602509b436aad36d41135f14ce
Component: engine
2015-11-19 22:22:27 +08:00
12f51add56
Merge pull request #17704 from LK4D4/default_cgroupfs
...
Use fs cgroups by default
Upstream-commit: c32f8bb36a5f1b2fe0586a1e080c14d8a6b68610
Component: engine
2015-11-19 14:01:13 +01:00
92c9b9e9d4
Use fs cgroups by default
...
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 419fd7449fe1a984f582731fcd4d9455000846b0
Component: engine
2015-11-18 16:16:13 -08:00
3ac379c684
Merge pull request #18069 from vdemeester/fix-volume-doc-typo
...
Fix a small typo in volume_inspect.md
Upstream-commit: ec721639492cd4a2feb3f7a843429a923262734d
Component: engine
2015-11-18 10:14:15 -08:00
92d26f8f83
Fix a small typo in volume_inspect.md
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a96be2930a64be88a5e8bf0e3b0283c657f73844
Component: engine
2015-11-18 16:02:24 +01:00
550ebeac8f
Merge pull request #17973 from moxiegirl/fix-networking-issue
...
Fixing issue noted by user
Upstream-commit: 0780ad4857bb7db1caaf6c4c1d60970d5695c464
Component: engine
2015-11-18 12:49:11 +01:00
420b5b0afe
Merge pull request #17992 from nak3/fix-wrong-setting-in-systemd
...
Fix invalid proxy setting example
Upstream-commit: 3f5e5b8f57f5b4c1eb4ead9327f9d071f8fd5b8a
Component: engine
2015-11-18 12:48:41 +01:00
42a56c8bb4
Merge pull request #17986 from bogdangrigg/master
...
Fix small typos in documentation files
Upstream-commit: c83373112c908f7c5afc85fc6b08640817920a6d
Component: engine
2015-11-17 16:45:38 -08:00
4457dd940b
Merge pull request #18011 from lrkwz/patch-1
...
Update ubuntulinux.md
Upstream-commit: 2ee56ce1e1b3f8f6ab72b4235ad28387fe81b675
Component: engine
2015-11-17 16:44:33 -08:00
6064eebd4e
Merge pull request #17866 from shekhargulati/patch-1
...
added rx-docker-client library
Upstream-commit: 662b9623c1e47676f40b5dccd150475d54cd88a0
Component: engine
2015-11-17 16:15:15 -08:00
c4d89a3f60
Merge pull request #17478 from vdemeester/pr-13921
...
Carry#13921 : Expand /info: Expose OSType (GOOS), Architecture (GOARCH)
Upstream-commit: 104dab87ea73fbf7e4e592c2045b4f1ab56c6cfe
Component: engine
2015-11-17 15:44:57 -08:00
0fb0e27d0c
Merge pull request #17419 from nathwill/cent-install-docs
...
fix yum install docs
Upstream-commit: aeccd45e5b4074cebb1cbe3bb51b6bde4111048a
Component: engine
2015-11-17 20:57:15 +01:00
22f6a379ae
Merge pull request #17300 from kunalkushwaha/plugin-info
...
Patch for Plugin drivers in docker info
Upstream-commit: f18d5da6a7d148581f8de041ada62b1724839957
Component: engine
2015-11-17 10:46:29 -08:00
20dbe8b748
Remove redundent lines
...
Signed-off-by: gissehel <public-devgit-dantus@gissehel.org >
Upstream-commit: 741246d69f7708941ee86a706c6e93d20275904f
Component: engine
2015-11-17 18:24:17 +01:00
98dbfb535e
Merge pull request #17724 from runcom/remove-depreciated-cli-flags
...
Remove depreciated cli flags
Upstream-commit: d507acb17564986af17f653d8fa1b774993451b4
Component: engine
2015-11-17 16:40:06 +01:00
844d964e9e
Fix Markdown syntax error in aufs-driver
...
Signed-off-by: dm4 <dm4@skymizer.com >
Upstream-commit: ea047640597929436f13099fb3dc1e52f98f685b
Component: engine
2015-11-17 17:38:36 +08:00
cbf9321ca8
Merge pull request #17891 from splunk/splunk-logger-support-for-tag-env-labels
...
Allow configurable metadata for Splunk log driver
Upstream-commit: a3065fa48f889ef438a7d7339ebc8fe01aca10dd
Component: engine
2015-11-16 10:11:27 -08:00
a86a41003e
Merge pull request #17515 from azurezk/fixdoc
...
fix doc of volume name conflict
Upstream-commit: 4b706195d2e5b551ce08620862fdc4a8f8c8489f
Component: engine
2015-11-16 09:15:50 -08:00
e0d2996208
docs: modifying volumes guide to remove ambiguity. Signed-off-by: Andre Granovsky <robotciti@live.com>
...
Adjusted as per comment.
Rebase and squash by moxigirl
Signed-off-by: Andre Granovsky <robotciti@live.com >
Upstream-commit: be2152116cd719b65d4b58c3b8fb7f63d7655f4b
Component: engine
2015-11-16 08:24:26 -08:00
a3d77b0213
Update ubuntulinux.md
...
Remove '*' for purge
Signed-off-by: Luca Orlandi <luca.orlandi@gmail.com >
Upstream-commit: fe123edb080a2e60ce4d34fb0cf72d06c80cba79
Component: engine
2015-11-16 13:29:36 +01:00
3e26fccb77
Supported added for reterving Plugin list for Network and Volume.
...
Also, plugin information in docker info output.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp >
Upstream-commit: aa7fd884e609d3d13df628600a1799e0e76444e9
Component: engine
2015-11-16 15:28:09 +09:00
35adb0ee96
fix doc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix doc
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 82ba25bea9ae8412186e4cd1d3ba30e6a2072a26
Component: engine
2015-11-15 23:32:40 +08:00
2e538bcbf1
Remove deprecated cli flags
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 7929888214741c4ab194c44e0b14ac08aca06556
Component: engine
2015-11-15 10:40:01 +01:00
58a0ba7cc6
Fix invalid proxy setting example
...
Signed-off-by: Kenjiro Nakayama <nakayamakenjiro@gmail.com >
Upstream-commit: d9ef4f2986b93b64289d858c55b3bee67804c444
Component: engine
2015-11-15 17:11:27 +09:00
2052e6ad6a
Fix small typos in documentation files
...
Signed-off-by: Luca-Bogdan Grigorescu <bogdan@gmail.com >
Upstream-commit: d1e72baa15fb81a6dcf80e6727b884fc8ff67335
Component: engine
2015-11-15 00:53:27 +02:00
964f8b63bd
Add pkg/parsers/architecture and pkg/platform
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 49779b674af09b46c165c8dfe2e76054336b0595
Component: engine
2015-11-14 23:03:02 +01:00
3e0bec1370
/info: Add keys Architecture, OSType
...
- introduces Swarm-relevant keys, see #13634
- docs updated
Signed-off-by: Olle Jonsson <olle.jonsson@gmail.com >
Upstream-commit: 4e8fcd40028ed09b139b6f86954e676a1839be9c
Component: engine
2015-11-14 22:21:45 +01:00
aac6b83468
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
Upstream-commit: f5e318a17b8bd3126281add5e82dfb09be5b8f11
Component: engine
2015-11-13 14:29:34 -08:00
775e6c0f07
Support multi-dir wildcards in .dockerignore
...
Closes #13113
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eddb14a44eb3ca6ba0b5e6906e21d767eba1af86
Component: engine
2015-11-13 13:44:07 -08:00
914d3208ce
Fixing issue noted by user
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 0a316477802466c50a66d165f3f9c2e4c827675e
Component: engine
2015-11-13 10:28:51 -08:00
41bc75b63d
Merge pull request #17961 from pidster/add-weave-network-plugin
...
Add Weave Network Plugin to docs/extend/plugins.md
Upstream-commit: f49fb0708629c175d19c14558b9f9c091c71a291
Component: engine
2015-11-13 10:12:58 -08:00
e628862038
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
2015-11-13 09:37:06 -08:00
98eee11b79
Add Weave Network Plugin to docs/extend/plugins.md
...
Signed-off-by: pidster <pid@pidster.com >
Upstream-commit: f57073c72bfb30b083730be0623210ad5381ec58
Component: engine
2015-11-13 10:09:22 +00:00
23764c99f4
Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
...
docs: update supported drivers for docker logs
Upstream-commit: 02bc514fb8f41c8e8815c835241d114a6d6fdbd2
Component: engine
2015-11-13 07:37:47 +01:00
e82bb6d8de
added rx-docker-client library
...
Signed-off-by: Shekhar Gulati <shekhargulati84@gmail.com >
Upstream-commit: 4e4a68415cc2a85a77241a0e63d7ea2a5d4e6090
Component: engine
2015-11-13 08:23:57 +05:30
1ba9d92e95
Merge pull request #17941 from s093294/patch-1
...
updated instruction to correct file path
Upstream-commit: c5a10b1d2702937042e36e062016e1b5a868ad3c
Component: engine
2015-11-12 16:34:18 -08:00
1f5e02cdda
Merge pull request #17942 from thaJeztah/speedy-boarding
...
Docs: improve caching for make docs
Upstream-commit: c8399630ca5c85ab3020a3d621e11f536d9ac6ee
Component: engine
2015-11-12 16:33:41 -08:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
06f47a5302
Replace now broken link with a "permalink"
...
Fix #17927 .
Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: 6b02876362680a1acd2c0fb1fdd85183cee03f20
Component: engine
2015-11-12 19:17:29 +01:00
d26ed08b21
Docs: improve caching for make docs
...
Use caching for all other repositories, instead
of doing a svn checkout each time.
This may result in showing outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06a4e5f9815d55a91b17cc1eb6556bf029057ec6
Component: engine
2015-11-12 16:30:40 +01:00
f625d79ed0
updated instruction to correct file path
...
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz >
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net >
Upstream-commit: 593586721341c9e0acb00b55d1c3f283ac162697
Component: engine
2015-11-12 16:15:29 +01:00
bba768bb09
Allow configurable metadata for Splunk log driver
...
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
46dd659ee1
Merge pull request #17631 from sallyom/docker-login-non-root
...
clarify docker login
Upstream-commit: 9c6e3396ef7ba44837ffaede0345ab3a105e8116
Component: engine
2015-11-12 22:39:35 +10:00
1449d82902
docker-login man/doc add security info
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
Upstream-commit: f9657819cdd9ea2a9327887db1c5a4aa405ffae9
Component: engine
2015-11-12 07:25:35 -05:00
66ebb69509
docs: fix link to "run reference"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f2705fa6ede76ad8b307ca184d3e146f5d69f7e6
Component: engine
2015-11-12 12:38:46 +01:00
5a4e81dc0c
Merge pull request #17388 from vikstrous/notary_docs
...
more notary documentation
Upstream-commit: 40ed821d2ebd9abb5cb9cf5c11c7b67c905ee3be
Component: engine
2015-11-11 20:07:55 -08:00
