add6b1169c
update docs/introduction/understanding-docker.md
...
Signed-off-by: Jeremy Qian <vanpire110@163.com >
Upstream-commit: f5343a039bc28b5c290c72b5305436f526e81eba
Component: engine
2015-11-21 10:43:25 +08:00
00b4e54e91
Merge pull request #18127 from KostyaSha/patch-1
...
Add Dead state to Container Inspect 1.21 API
Upstream-commit: 7caa313c821a06af4f1423dbbf17d0b77ff17c31
Component: engine
2015-11-20 14:39:25 -08:00
b97ed2a561
Merge pull request #17495 from mikebrow/docker-tz-and-nanosecond-updates
...
modifying docker --since and --until to support nanoseconds and time …
Upstream-commit: 6653f827965b431139af141fa2cc68a6513abe71
Component: engine
2015-11-20 23:37:44 +01:00
fbb546d71a
Add Dead state to Container Inspect 1.21 API
...
Signed-off-by: Kanstantsin Shautsou <kanstantsin.sha@gmail.com >
Upstream-commit: 836d0127fdf39d5e5978bc27f54a99aea636061b
Component: engine
2015-11-21 00:06:37 +03:00
1a66a2a6f7
Merge pull request #18094 from tophj-ibm/faq-link-fix
...
Fixed docker network link in faq
Upstream-commit: d395134b3df59cf9377c78255c56867f126c7674
Component: engine
2015-11-20 12:13:07 -08:00
9479751884
Merge pull request #17718 from wenchma/17716_before_filter_doc
...
Re-implement --before and --since as options for --filter
Upstream-commit: 8fa09749fb7b5560ffc7f0a73005302f99d89d01
Component: engine
2015-11-20 11:24:19 -08:00
4abbb3cdf7
Merge pull request #18109 from phemmer/yum-docs-fix
...
remove unnecessary echo from yum docs
Upstream-commit: c1f11f81441fffc556ec0a45cb299d16ffe04947
Component: engine
2015-11-20 13:10:55 -05:00
6d12941a33
Merge pull request #16168 from NIWAHideyuki/16164-shm-size
...
Addition of "--shm-size" to which size of /dev/shm is changed
Upstream-commit: a76bdea21ba204b1cdc6648a182ae82355350a5f
Component: engine
2015-11-20 10:01:48 -08:00
f0ecd6735e
Merge pull request #18101 from IanLee1521/patch-1
...
Fix minor grammar mistake.
Upstream-commit: 7a1b05ccce18cbec4742c0a766f3424f817837df
Component: engine
2015-11-20 11:43:42 +01:00
4cd1a52462
Merge pull request #18026 from woodvi/doc-network-tutorial
...
change "Web" to "web" to match case-sensitive name used for creation;…
Upstream-commit: d8ea32caa8b312d5b3b01b4e72b8e0e56d958653
Component: engine
2015-11-20 10:46:00 +01:00
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
9380772bfb
Re-implement --before and --since as options for --filter
...
* This commit will mark --before and --since as deprecated, but leave their behavior
unchanged until they are removed, then re-implement them as options for --filter.
* And update the related docs.
* Update the integration tests.
Fixes issue #17716
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com >
Upstream-commit: 1921c629381d25ebff7b8b8c8348a0a81525f264
Component: engine
2015-11-20 13:10:13 +08:00
1b8755d994
remove unnecessary echo from yum docs
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
Upstream-commit: 3cbccccb37f6f50ebb49e9738af09a0d7d79549a
Component: engine
2015-11-19 20:51:43 -05: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
4581692a0e
Addition of "--shm-size" to which size of /dev/shm is changed.
...
- Optional "--shm-size=" was added to the sub-command(run, create,and build).
- The size of /dev/shm in the container can be changed
when container is made.
- Being able to specify is a numerical value that applies number,
b, k, m, and g.
- The default value is 64MB, when this option is not set.
- It deals with both native and lxc drivers.
Signed-off-by: NIWA Hideyuki <niwa.hiedyuki@jp.fujitsu.com >
Upstream-commit: 5aeaf2a0c4236711e0981515d8627b30e22a1637
Component: engine
2015-11-20 09:24:18 +09: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
61aac55c3c
Fix minor grammar mistake.
...
Signed-off-by: Ian Lee <IanLee1521@gmail.com >
Upstream-commit: ad7696a78775df7cc671113b29fb34ca66b3ace5
Component: engine
2015-11-19 12:24:25 -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
eaf8c7856d
Fixed docker network link in faq
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 1f0dc72d4abd1ddc7e348934c6a1bc59f6937678
Component: engine
2015-11-19 11:08:04 -06: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
0cbb4862c1
change "Web" to "web" to match case-sensitive name used for creation; enquoted bash cd command for un-tar example
...
Signed-off-by: Victor I. Wood <viw@t2am.com >
Upstream-commit: ac526193afca9cb529d6c61f88bbdde11e2382aa
Component: engine
2015-11-16 12:41:06 -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
