7a161db875
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
Upstream-commit: c88b2c422ff55099f8dae2a39566698c42b3d354
Component: engine
2015-04-02 16:01:09 -04:00
5a322b178c
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
Upstream-commit: 42c78550142321f4b5109118f3d2d2b8c529e83c
Component: engine
2015-04-02 16:00:39 -04:00
f437be36ca
Merge pull request #12026 from cpuguy83/add_self_to_maintainers
...
Add cpuguy83 to maintainers.people
Upstream-commit: 104b20a133e03b66dfd663ee135b0ac1e3bc7c73
Component: engine
2015-04-02 09:20:19 -07:00
1031605b86
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
2015-04-02 18:26:29 +03:00
b507a74819
Add cpuguy83 to maintainers.people
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 6ac845edadbf6374a9ee53f105c34265aed32d42
Component: engine
2015-04-02 08:51:47 -04:00
088a52cbda
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
Upstream-commit: 9707286a5cecde3eee3c83e3c2da65df8e59d04e
Component: engine
2015-04-02 08:25:49 -04:00
3c9c482afa
TestVolumesFromHasPriority fix race
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Upstream-commit: c447fd339a9293ea528ba0c8f4154cf1f953186c
Component: engine
2015-04-01 18:06:28 -07:00
51cc2549fc
fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container...
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Upstream-commit: f472c7236f7f7ea069b2997391569e5ec60981ab
Component: engine
2015-04-01 17:47:36 -07:00
9135f9f621
Merge pull request #10745 from jfrazelle/device-dir
...
Mounting a dir of devices like /dev/snd should mount all child devices
Upstream-commit: b9be50b578f86e858113b9c334e1748e15b63263
Component: engine
2015-04-01 16:53:01 -07:00
d12a5b6e48
Merge pull request #12007 from crosbymichael/fix-oom-hang
...
Return closed channel if oom notification fails
Upstream-commit: 3f77f627d041ae388f4f591a2187be225629d6b7
Component: engine
2015-04-01 15:59:20 -07:00
c8180f954e
Mounting a directory of devices like /dev/snd should mount all child devices.
...
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: 664004ed0c6c99369720a00f5673f1e106d9496d
Component: engine
2015-04-01 15:57:41 -07:00
8f29ea870c
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
Upstream-commit: 3fe7a3d53766de88cddd0e1c324869183cd609cf
Component: engine
2015-04-01 15:34:28 -07:00
8391dba9e0
Merge pull request #11099 from iavael/bugfix/tar-symlinks
...
Fixed handling hardlinks to symlinks in tar stream
Upstream-commit: 88b8fc10e3dc5613859da31900e0a1b0bbb303c6
Component: engine
2015-04-01 18:34:00 -04:00
aeb6266db3
Return closed channel if oom notification fails
...
When working with Go channels you must not set it to nil or else the
channel will block forever. It will not panic reading from a nil chan
but it blocks. The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7061a993c5b620d6e68450f1b90f3458bfa1add0
Component: engine
2015-04-01 15:30:48 -07:00
8815a68d5e
Merge pull request #12006 from icecrime/add_kitematic_to_readme
...
Add Kitematic to README.md
Upstream-commit: 2c0ee48224d4831db55b66073f4b4a1f1a0d86f5
Component: engine
2015-04-01 14:41:41 -07:00
444eef9af1
Add Kitematic to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 7bd250c74d1dbc64be2ccb0978e1babd55d18afa
Component: engine
2015-04-01 14:38:49 -07:00
cd5f423b1f
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 81f9b72c648142745c63ab0ba2b495646dccd88d
Component: engine
2015-04-01 13:40:56 -07:00
80f31b5c3f
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
Upstream-commit: 4467b6a2cbb2b075803e4a6cc10672871cb6c323
Component: engine
2015-04-01 16:32:41 -04:00
f573d53da8
Merge pull request #11990 from duglin/11985-RemoveDeadCode
...
Remove dead code looking for non-existent err msg
Upstream-commit: 7101419c1c44083cf8ba30b4469d4cde4ab05e55
Component: engine
2015-04-01 10:46:10 -07:00
d47bbc4765
Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest
...
Fix random error in cli events test
Upstream-commit: 624de8a9cd5652d0d685596d490997f7f2e83536
Component: engine
2015-04-01 09:26:48 -07:00
3e035d76a2
Add support for more advanced ${xxx:...} syntax
...
Just ${xxx:+...} and ${xxx:-...} for now
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 39908fc6d9a13f0d44196475ba938b6cc352fdbe
Component: engine
2015-04-01 08:11:15 -07:00
2a679a09de
Merge pull request #11969 from powo/patch-1
...
Update networking.md (IPv6 wrong prefix)
Upstream-commit: 39711c8b26ccbeace0a6ec9246ad0ba65e468904
Component: engine
2015-04-01 07:45:31 -07:00
99e92a4e37
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: d351aef8afc5a215668248652aad52856949eaa0
Component: engine
2015-04-01 07:37:10 -07:00
97627eb7d2
Merge pull request #11972 from thaJeztah/docs-fix-heading-level
...
docs: fix heading level of logging drivers
Upstream-commit: dc564d8cf8ba5221edcddc267d0ae7ac9a2b73da
Component: engine
2015-04-01 07:34:45 -07:00
631fb354cf
Merge pull request #11982 from sunyuan3/docker-run
...
Fix typoes in docker-run.1.md
Upstream-commit: f73109b8833517e2d095e5e9be0acaa17284738e
Component: engine
2015-04-01 07:32:06 -07:00
bd9cf26ed2
Merge pull request #11954 from ankushagarwal/#11953
...
Use different host and container port for clarity
Upstream-commit: a73b7354a6d782d180cc01cec8b45f6253ebf72b
Component: engine
2015-04-01 09:21:15 -04:00
df6b8b71c3
Fix typoes in docker-run.1.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a44451d40eb3e1b3d19a0525f70736406c66d2d1
Component: engine
2015-04-01 17:09:01 +08:00
562a382719
Fix random bug in cli events test
...
Signed-off-by: Mabin <bin.ma@huawei.com >
Upstream-commit: e15c3e36cc5559c3ec17179d8740b2841709daf5
Component: engine
2015-04-01 11:00:01 +08:00
a6e32781c9
Merge pull request #11975 from duglin/FixOOMTest
...
Increase timeout on TestRunOOMExitCode test
Upstream-commit: 98cfa2aecdb208ebc30dfc17ee3ed8ebbb05a72a
Component: engine
2015-03-31 17:24:26 -07:00
e8ab23fa21
Increase timeout on TestRunOOMExitCode test
...
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8d1455d88b66011713da67098dc3464b897af9cd
Component: engine
2015-03-31 16:57:43 -07:00
59fa60cd98
Merge pull request #11930 from unclejack/broadcastwriter_refactor
...
pkg/broadcastwriter: use []byte to lower alloc
Upstream-commit: e736f16bbd15bd9fa10fac22cd3016050a91e6e5
Component: engine
2015-03-31 16:47:23 -07:00
753b8ae08c
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 03d3d79b2b3f8b720fff2d649aff0ef791cff417
Component: engine
2015-03-31 16:38:04 -07:00
ac9aaec491
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
Upstream-commit: 596ddef7d73273103a7b900fa46d4392e1d3e27b
Component: engine
2015-03-31 16:37:32 -07:00
1394c160e0
Fix heading level of logging drivers
...
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.
Also changed "Log driver" to "logging driver" for JSON.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: f855d5dde70f1f3e4390e53576a3ca9b5a9db8ba
Component: engine
2015-04-01 01:07:22 +02:00
179a6af99a
Update networking.md
...
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at >
Upstream-commit: 6a47c70d60f5ac92b152e1c8ef7fe5b714fe7833
Component: engine
2015-04-01 00:44:41 +02:00
4b9b1a6d15
pkg/broadcastwriter: reset after 4 KB w/o stream
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 153f98bad51e2f46cf3853d2da0173bcfb4b687d
Component: engine
2015-04-01 01:26:19 +03:00
03e99ba9b2
Fix panic in integration tests
...
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: c71747571458bf992c729c483c9509e8182d630b
Component: engine
2015-03-31 15:12:15 -07:00
bce31440c3
Skip heavy operations if there is no jsonlog writers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d15d1674c318366e881fa4ea2977192750d3471b
Component: engine
2015-04-01 01:02:18 +03:00
e1d3084c1a
pkg/broadcastwriter: use []byte to lower alloc
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 5550a46946a2e6e1be8844d78a78122b333fae26
Component: engine
2015-04-01 01:02:18 +03:00
a17bdc8390
pkg/jsonlog: add JSONLogBytes for low allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: b535ed3595036931e8e6f4e9da7cd2beb67cb19e
Component: engine
2015-04-01 01:02:18 +03:00
25208704c6
pkg/broadcastwriter: add test w/ "" stream only
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: f26f405b00a2d9d1c6ebc11bffb810c54ac510ce
Component: engine
2015-04-01 01:02:18 +03:00
a5206cf154
Merge pull request #11952 from ankushagarwal/#11581
...
Add some documentation to pkg/system
Upstream-commit: 7dd79dcc7b0c1e0a577de0e232fd936086e9a2cd
Component: engine
2015-03-31 14:58:32 -07:00
f06c130d5c
Merge pull request #11962 from vbatts/vbatts-promote_overlay
...
graphdriver: promote overlay above vfs
Upstream-commit: ded5c73debbf867e17ea611407b76ce2bf043651
Component: engine
2015-03-31 14:39:08 -07:00
dda21393df
Merge pull request #11963 from crosbymichael/api-server
...
API Server Socket Refactoring
Upstream-commit: e4545ed8cb592d692563d1bb026d6feea07f2437
Component: engine
2015-03-31 14:25:32 -07:00
3a4dbacc2f
graphdriver: promote overlay above vfs
...
It's about time to let folks not hit 'vfs', when 'overlay' is supported
on their kernel. Especially now that v3.18.y is a long-term kernel.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 2c72ff1dbfa83aa8f797bdfebaacb8a919677326
Component: engine
2015-03-31 17:18:49 -04:00
9ec5ab1d3d
Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849
...
Fix progress reader output on close
Upstream-commit: da6248751b4e5300fe02e0b02bd4a664ba348044
Component: engine
2015-03-31 14:04:33 -07:00
1541e9c937
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
Upstream-commit: 749a117267c4c0f74b0162af9ed42c3307737dde
Component: engine
2015-03-31 13:56:23 -07:00
358cb6ec63
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 62806cc85e7faee56acc454b67b8f36786472759
Component: engine
2015-03-31 13:37:49 -07:00
9b832a806e
Merge pull request #11958 from LK4D4/fix_portmapper_race
...
Move portmapper initialization to var block
Upstream-commit: b85cf5da5e27014ff2e5499d91168678c5c99caa
Component: engine
2015-03-31 13:23:45 -07:00
d0e4d6404c
Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test
...
Added basic integration tests for docker wait command
Upstream-commit: a381a1bb0385c9f499025f632413bf6a9abc3f43
Component: engine
2015-03-31 13:23:23 -07:00
