b498641d47
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
Upstream-commit: 6f8c4480e4f99b08c84d25f1611d6b12ee646066
Component: engine
2015-08-25 16:42:13 +02:00
322a07231d
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
Upstream-commit: 903cd2b9e3e2cea8b5ee7c0b74d52ff4a3beafb5
Component: engine
2015-08-24 17:55:03 -07:00
02b562a357
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
Upstream-commit: 562cc6254fbeae24be2cc7ab5b4a608bcb06ac5f
Component: engine
2015-08-24 20:15:09 -04:00
a5560b01cb
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
Upstream-commit: 6b21e98432ef3c4c9b7da42cdb94749b9181b654
Component: engine
2015-08-24 10:58:49 -07:00
83ec490c79
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
Upstream-commit: fd8b25c802780683cc5776e6d3aaca9536e7370b
Component: engine
2015-08-24 13:48:56 -04:00
84c411f6f2
Merge pull request #15735 from tonistiigi/graph-register-readcloser
...
Make graph.Register take in io.Reader
Upstream-commit: 1544c5edb6fc796918a0bc2968a48df4e23a9fdb
Component: engine
2015-08-24 10:40:04 -07:00
c6a7b3f411
Make events test more deterministic in go1.5
...
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 386aefb9fcf65f1a5f68fd61e5108ea0858d2d3f
Component: engine
2015-08-24 09:35:11 -07:00
3170babd78
Merge pull request #12918 from thieman/tnt-issue-12595
...
Use image ID in ps if tag has been updated
Upstream-commit: e14eaba784c3c78a964c5e50e8fa113d3321bbf8
Component: engine
2015-08-24 12:24:42 -04:00
a8c00ae391
Change return value for ValidateMountMode
...
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c99ed5ae5d0a9167ead73a798b02600ad40651f2
Component: engine
2015-08-24 17:28:19 +08:00
7143030753
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
Upstream-commit: 9bac520c129c9fd5c9415b5170a66567d85247b4
Component: engine
2015-08-24 11:03:41 +02:00
dd5279c777
Use image ID if tag has been updated
...
Fixes #12595
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
Upstream-commit: 2167f40a766d1909443695d96bcecc3d039fb482
Component: engine
2015-08-23 12:11:24 -04:00
5221811ef0
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: ce5bbed8582227482f7afa1c647d52eab9fb2de3
Component: engine
2015-08-22 10:09:07 +08:00
427f147704
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
Upstream-commit: 90801ab9398d80576003d31255dd08613393b741
Component: engine
2015-08-21 16:34:03 -07:00
26bf545a48
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
Upstream-commit: 9bd8a9b66bb493026599d22c7637909cb460d039
Component: engine
2015-08-21 14:34:27 -07:00
ad05d1ea8d
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
Upstream-commit: ecff4badcd98f749e5bd8511fbf4ca2c605db96c
Component: engine
2015-08-21 14:27:59 -07:00
20b08ad6cb
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
Upstream-commit: 19f7bfcda9ea11806a39a6508d3961649ba8ba5d
Component: engine
2015-08-21 14:23:44 -07:00
48cf51659b
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
Upstream-commit: 9b8cfb6c79904bf74edae7c3fcc317e525f82fc7
Component: engine
2015-08-21 14:21:10 -07:00
0e5e69219f
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: a456f20b44637b861740a7dd0102073f6390c452
Component: engine
2015-08-21 13:23:04 -07:00
d84f50c157
Make graph.Register take in io.Reader
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 2d1158790dc56df6d2b39a9c94acf34d62299b91
Component: engine
2015-08-20 20:37:11 -07:00
0313208649
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
Upstream-commit: c8a46cb0b2793bb7d742a3d221ec733d1bbaae2c
Component: engine
2015-08-21 11:29:53 +08:00
3b6efefc4b
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
Upstream-commit: 90ebc3b455c93490c3886aaa491c7e67b7b1ec48
Component: engine
2015-08-20 03:25:00 -07:00
e87c28da2c
added check for bind on create to determine local volume driver
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
Upstream-commit: 6b8129d1fe9b1428833e1c38e463a5a4cc204390
Component: engine
2015-08-20 01:40:04 -07:00
ec5ff634b7
daemon/state: separate part of SetRestarting to setRestarting
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: a6ed99059384e8544680186d2a4d1afb1cdbba38
Component: engine
2015-08-20 11:14:28 +08:00
58ef88608a
Add support for sharing /dev/shm/ and /dev/mqueue between containers
...
This changeset creates /dev/shm and /dev/mqueue mounts for each container under
/var/lib/containers/<id>/ and bind mounts them into the container. When --ipc:container<id/name>
is used, then the /dev/shm and /dev/mqueue of the ipc container are used instead of creating
new ones for the container.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: d88fe447df0e87b3a57f9d08b108b141dd72678c
Component: engine
2015-08-19 12:36:52 -04:00
3004521c7f
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: b6f1b4ad350cbf1f540797eee44520694237d47c
Component: engine
2015-08-19 23:56:55 +08:00
815901c7f0
Add CheckKernelVersion so we can check any specific version
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 87959dbfac6827afa10a78c4635acddebfd5fc8e
Component: engine
2015-08-19 23:49:52 +08:00
5918f0bba9
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
Upstream-commit: 70c4b6e619003c50da82b2dedeeda67a159fe50e
Component: engine
2015-08-19 08:05:27 -07:00
68987b8336
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
Upstream-commit: 59e49e1db0c4b59d8ca7334fdadade73755969b9
Component: engine
2015-08-19 17:04:23 +02:00
49b3bfecf2
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com >
Upstream-commit: 78676f19c1939ad984c809ed81db665adf1576f5
Component: engine
2015-08-19 14:16:40 +02:00
2415190b1c
Merge pull request #15662 from cpuguy83/noisy_blkio_warning
...
Quiet sysinfo warnings on container create/start
Upstream-commit: 215a1136f7a65a68a2b2999bdb00d05758882073
Component: engine
2015-08-18 11:47:17 -07:00
2bf42179ec
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 10305dc5e8cc7e2e1560ce2abe93c17e923a1c47
Component: engine
2015-08-18 11:39:06 -07:00
57a4ccd575
Merge pull request #15649 from LK4D4/syslog_validation
...
Syslog validation
Upstream-commit: 8aa520b8c020dd78055fbf4423ca0c086f3e4bf4
Component: engine
2015-08-18 11:14:31 -07:00
5ec41f4690
Quiet sysinfo warnings on container create/start
...
This was making logrus warn on each container create and start.
These warnings are not needed as the code below already warns when these
various cgroup settings aren't supported but have been set.
Warnings were originally introduced by #15381 , which appear to be a
side-effect of that change and not the intention.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: e9d8e38c4758fdc0ebca5b54cdc1ba253cbbd438
Component: engine
2015-08-18 10:01:52 -04:00
6442b64e6e
Fix build with resource limit which system is not support.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 770daa15f359ddc7329a2a031332c251e5a53a29
Component: engine
2015-08-18 11:54:00 +08:00
a3521c2e7e
fix in daemon side
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
goformat
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix small
Signed-off-by: Zhang Kun <zkazure@gmail.com >
change to rm
Signed-off-by: Zhang Kun <zkazure@gmail.com >
handler other error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
unique ERR
Signed-off-by: Zhang Kun <zkazure@gmail.com >
setHostConfig_fail_test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
format
Signed-off-by: Zhang Kun <zkazure@gmail.com >
err handle and modify test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
golint error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
Upstream-commit: 1ed15550f57ae822bb30263ce81174cabeb794ec
Component: engine
2015-08-18 10:06:36 +08:00
7a8e3f26ae
Merge pull request #15650 from LK4D4/fix_max_file_error
...
Fix error message in max-file validation
Upstream-commit: fd2e945d155e7506ece7f3ada867b06a2eff7656
Component: engine
2015-08-17 20:27:12 -04:00
39fa3c5eb8
Merge pull request #15632 from mountkin/fix-15626
...
a quick fix to #15626
Upstream-commit: 1c916dbd8359beb9db14f2688879977db86b2c1d
Component: engine
2015-08-17 20:26:47 -04:00
3107abf81b
Fix error message in max-file validation
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: cde607108badc84ddb6a7e2d2f75ce31be9967a5
Component: engine
2015-08-17 15:34:39 -07:00
8deea878c7
Fix LogConfig.Config in inspect
...
Also add test for daemon-wide log-opt.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f61002b05794eb5e4262a39e29f8a45c7260ba3
Component: engine
2015-08-17 15:27:44 -07:00
03328caba1
Check syslog config on daemon start
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 960791ba60621ef2b182379e7b237e681b602694
Component: engine
2015-08-17 14:29:45 -07:00
acbee0eb90
Do not allow corrupted syslog-address
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b7a6d14bdc56e9397be8c9bef9c3d991ff30fe77
Component: engine
2015-08-17 14:19:06 -07:00
d3fcc3f0db
daemon/graphdriver fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 9e1a41aae53a9f9fb260c3666db2d4228ea4f50b
Component: engine
2015-08-17 19:27:36 +00:00
c19232ca91
Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
...
Fix `inspect` output when no log driver specified
Upstream-commit: 5aeb48af7702be78774c36cfabbda1b3bf1c7b34
Component: engine
2015-08-17 11:03:37 -07:00
d9d9dff9a7
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
Upstream-commit: 2e7b088164960b7981a058f34336c05dc52f2c53
Component: engine
2015-08-17 10:45:48 -07:00
f403372672
Fix inspect output when no log driver specified
...
Config options were being ignored in the inspect output when no driver
was specified.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2f2779b6a5c8f6efcd2ba55bf7cb0db54c259726
Component: engine
2015-08-17 11:35:34 -04:00
e353ad2a0e
a quick fix to #15626
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 3977f30869fad2c679d7913ce968add7c7987282
Component: engine
2015-08-17 21:35:57 +08:00
f2f5327a6e
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
Upstream-commit: e1f3a5ad0aade527c1b00385652aec21d1cf09ac
Component: engine
2015-08-16 00:20:41 +02:00
73f39654a9
Windows: Graph remove custom interface and add central store
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Windows: add support for images stored in alternate location.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Upstream-commit: dfbb5520e3b35030f3eef38d5a2d86ad20ea0a2f
Component: engine
2015-08-14 23:45:53 -07:00
470c87b117
Adding support to publish on custom host port ranges
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
Upstream-commit: 47272f9cc563ea90d1f86df044f5429d15a37e4f
Component: engine
2015-08-15 02:41:29 +00:00
809e0fd73f
Merge pull request #14530 from Microsoft/10662-serversidevalidation
...
Windows: [TP3] Move netmode validation to server
Upstream-commit: 3e523ae015750be4893b9c5a4f77361fbb0e9849
Component: engine
2015-08-14 16:05:59 -04:00
