0de35f39e7
bash completion for docker ps -f {before,since}
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: c49d3274067055dc830d97f1490a84aa73e403e6
Component: engine
2016-05-25 09:35:33 +02:00
6373766983
Merge pull request #22925 from jstarks/fix_integration_test
...
pkg/integration: Port tests to Windows
Upstream-commit: 29dbcbad878483d9239d6a432c85620aced895c4
Component: engine
2016-05-24 17:31:43 -04:00
2453234b4d
Merge pull request #22922 from justincormack/ppc64le-seccomp
...
Enable seccomp on ppc64le
Upstream-commit: bdc06cf8f8f4868186e3a843482afed48361cc09
Component: engine
2016-05-24 16:08:50 -04:00
d767f40c10
Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted
...
Remove unused mounted function in overlay
Upstream-commit: 0802401d22790ec85a620ac1c1ee41f81025c4a8
Component: engine
2016-05-24 13:08:06 -07:00
12513175c8
Merge pull request #22091 from amitkris/build_solaris
...
Get the Docker Engine to build clean on Solaris
Upstream-commit: 86a7632d63bdddb95aaf1472648056a4fb737d38
Component: engine
2016-05-24 21:41:36 +02:00
866c631581
pkg/integration: Port tests to Windows
...
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 8fc825364ac60848d4278c00429838c3f28f2cd7
Component: engine
2016-05-24 12:12:48 -07:00
0f8f43b91e
Merge pull request #22935 from thaJeztah/add-justin-to-maintainers
...
Add Justin Cormack to maintainers
Upstream-commit: 48a53d2e8c4db73c85c90c748d2f323ab458e8b9
Component: engine
2016-05-24 20:23:52 +02:00
1bdae7f37d
Remove unused mounted function in overlay
...
The mount check is now done by the FSChecker. This function is no longer needed and shouldn't be called.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: 5cc082473068b00dee123f8388a79d7a48842a57
Component: engine
2016-05-24 11:02:07 -07:00
0ec1e0058a
Merge pull request #22932 from chenchun/fix_build
...
Fix building image error if bridge network is disabled
Upstream-commit: 38217d43531c721da952a9de2a89b08397f7c029
Component: engine
2016-05-24 10:33:34 -07:00
eaeb1bdc9d
Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md
...
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
2016-05-24 18:21:52 +02:00
6f4700f12d
Merge pull request #22941 from AkihiroSuda/fix22940
...
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
Upstream-commit: f10a222de1cc756bb14d157b778d820fac3561aa
Component: engine
2016-05-24 18:13:44 +02:00
3185dc9996
Merge pull request #22264 from aaronlehmann/updated-image-spec
...
Update image specification for content-addressability changes
Upstream-commit: 7faa2a40bcfc2c8600a6895d09235081730d6f46
Component: engine
2016-05-24 18:06:52 +02:00
2e9725c51d
bash completion for daemon events
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: cc6a1b8bb3849f2ead3f89fc18a573034e1386f1
Component: engine
2016-05-24 17:19:03 +02:00
6696b4b541
Merge pull request #22906 from nshalman/patch-1
...
Clarification about 'docker build --build-arg'
Upstream-commit: ce07eac570e90ed8aa69472bae463902c075e078
Component: engine
2016-05-24 15:33:27 +02:00
2332228518
Clarification about 'docker build --build-arg'
...
See #22860
Signed-off-by: Nahum Shalman <nshalman@omniti.com >
Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac
Component: engine
2016-05-24 09:25:11 -04:00
df271497b6
Merge pull request #22900 from AkihiroSuda/fix22020
...
update docs/reference/commandline/cp.md
Upstream-commit: 6a385a00226dc7d8a35406ae284bb6731444d524
Component: engine
2016-05-24 14:06:02 +02:00
bda8efbc36
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
...
Fix #22940
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 1670914b8a56ab8e6ead38739fddb416b61e444f
Component: engine
2016-05-24 11:29:55 +00:00
4e2b010c12
update docs/reference/commandline/cp.md
...
Close #22020
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6
Component: engine
2016-05-24 11:09:38 +00:00
f5925d0f50
Add Justin Cormack to maintainers
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e427e4b108e9219316a56f72219a6fee93088da0
Component: engine
2016-05-24 11:09:39 +02:00
850246a4c4
Merge pull request #22590 from yongtang/22463-docker-daemon-events
...
Emit events for docker daemon
Upstream-commit: d76d38c7d028754c48f842e4631c2d897e63198d
Component: engine
2016-05-24 11:05:39 +02:00
6717a252a9
Fix building image error if bridge network is disabled
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: a8d013495c479cdc18fa7751413ef67334f37ee6
Component: engine
2016-05-24 16:20:26 +08:00
da14c60e92
Merge pull request #22928 from friism/patch-3
...
remove duplicated text
Upstream-commit: bf7bae9662a2de9cdb689ac813c503fe1157d6da
Component: engine
2016-05-24 08:38:40 +02:00
d6f4430048
Merge pull request #22541 from crosbymichael/graph-restore
...
Implement graph driver restore on reboot
Upstream-commit: d7dfe9103bfc275494d936a5d89f3067b0aedbc9
Component: engine
2016-05-23 22:57:23 -07:00
36a2f2d0be
Enable seccomp on ppc64le
...
In order to do this, allow the socketcall syscall in the default
seccomp profile. This is a multiplexing syscall for the socket
operations, which is becoming obsolete gradually, but it is used
in some architectures. libseccomp has special handling for it for
x86 where it is common, so we did not need it in the profile,
but does not have any handling for ppc64le. It turns out that the
Debian images we use for tests do use the socketcall, while the
newer images such as Ubuntu 16.04 do not. Enabling this does no
harm as we allow all the socket operations anyway, and we allow
the similar ipc call for similar reasons already.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: a83cedddc6d3e0fe1df352ec54245090df641ab8
Component: engine
2016-05-23 22:35:55 -07:00
e2f2261834
Merge pull request #22926 from justincormack/seccomp-test
...
Fix error channel size in seccomp test
Upstream-commit: a5aba7752a9716cde55e94705048407bed17374f
Component: engine
2016-05-23 22:28:24 -07:00
b1cf67eeb6
remove duplicated text
...
Signed-off-by: Michael Friis <friism@gmail.com >
Upstream-commit: 5271a69411e93a2b694c84f7f8216f0d91404e07
Component: engine
2016-05-23 19:01:30 -07:00
fe4d79b993
Add filter for events emitted by docker daemon
...
This fix tries to cover the issue raised in #22463 by adding
filter for events emitted by docker daemon so that user could
utilize filter to receive events of interest.
Documentations have been updated for this fix.
Additional tests have been added to cover the changes in this fix.
This fix fixes #22463 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 62014aaf9abeb4256cb66e7ae06bfdf5a77d1140
Component: engine
2016-05-23 19:00:47 -07:00
e954a0d7e9
Emit events for docker daemon
...
This fix tries to cover the issue raised in #22463 by emitting
events for docker daemon so that user could be notified by
scenarios like config reload, etc.
This fix adds the `daemon reload`, and events for docker daemon.
Additional tests have been added to cover the changes in this fix.
This fix fixes #22463 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 382c152a73dfa1d771334ffbe79759c5c3596144
Component: engine
2016-05-23 19:00:47 -07:00
f066a59cec
Fix error channel size in seccomp test
...
This was not changed when the additional tests were added.
It may be the reason for occasional test failures.
Signed-off-by: Justin Cormack <justin.cormack@docker.com >
Upstream-commit: 3598f2e33198686f0afa08aca640dbda8697fcb2
Component: engine
2016-05-23 18:14:55 -07:00
26b03e34e3
Merge pull request #22919 from LK4D4/carry_22754
...
cli: remove unnecessary initErr type
Upstream-commit: 9bc6c4ef80d8f7178c5b085bea83a5919e3abae1
Component: engine
2016-05-23 20:21:08 -04:00
2736991181
Remove mountedLayer Mount and Unmount
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 8bb4d31b10e4c3abee9ca92535461859bbf25d46
Component: engine
2016-05-23 16:52:58 -07:00
3a35464d9d
Get the Docker Engine to build clean on Solaris
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com >
Upstream-commit: 86d8758e2bb5e9d21d454ceda90b33feb8e74771
Component: engine
2016-05-23 16:37:12 -07:00
de30361155
Fix overlay use of rootdir and defer
...
Check for the rootDir first because the mergeDir may not exist if root
is present.
Also fix unmounting in the defer to make sure it does not have a
refcount.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 36a82c20321936a71b30fcfde8bc6c76d6cc8d1f
Component: engine
2016-05-23 16:03:40 -07:00
bfa2eac673
Add windows graph driver ref counter
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4bac8bce985b20d68422ef93de3adf4931b2dee5
Component: engine
2016-05-23 16:03:40 -07:00
49f1314f0b
Remove ref counting from layer store
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: e19499710e3728433cdc8348e985f9a825cb2336
Component: engine
2016-05-23 15:57:23 -07:00
987aa6f79e
Add reference counting to aufs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 5b6b8df0c1b5a54ae9a717810eedf9fc971e1321
Component: engine
2016-05-23 15:57:23 -07:00
50e99151eb
Add fast path for fsmagic supported drivers
...
For things that we can check if they are mounted by using their fsmagic
we should use that and for others do it the slow way.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 1ba05cdb6ade7e3abd4c4c3221b5e27645460111
Component: engine
2016-05-23 15:57:23 -07:00
e6822e5504
Remove restart test
...
This test is not applicable anymore now that containers are not stopped
when the daemon is restored.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 31e903b0e17d01a4240f7890218a80088d32658c
Component: engine
2016-05-23 15:57:23 -07:00
8f4e229dc9
Remove overlay pathCache
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 290be017c54ed99466339529bf8683ee00930c28
Component: engine
2016-05-23 15:57:23 -07:00
2b52cbdf3e
Restore ref count
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 009ee16beff4f6d3607fa251019908cc72ce0a34
Component: engine
2016-05-23 15:57:23 -07:00
32ca950a34
cli: remove unnecessary initErr type
...
Signed-off-by: ZhangHang <stevezhang2014@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: b65e57bed534b00350d091db1894fdff1c4230d5
Component: engine
2016-05-23 13:04:10 -07:00
890fe96d30
Merge pull request #22875 from Microsoft/jjh/nativeconsoleon
...
Windows: Turn on native console by default
Upstream-commit: 91bc4cca58dcd698b67f6e7cad7dc225a870eafe
Component: engine
2016-05-23 21:19:54 +02:00
0fa6812f20
Merge pull request #22665 from isubuz/20788-doc-valid-tag-name
...
docs: add valid chars in image name and tag
Upstream-commit: 2cd8b876ad1c235ccd932d101252423fa86aee06
Component: engine
2016-05-23 20:45:27 +02:00
af7458f4ff
Merge pull request #22774 from Microsoft/jjh/client
...
Windows: Daemon default to Hyper-V containers on client
Upstream-commit: 9f1a1212593e8e9ca4fcdeeaabc09e0deee8e806
Component: engine
2016-05-23 11:29:50 -07:00
0fe147094e
Merge pull request #22856 from thaJeztah/dont-warn-when-net-none
...
Suppress "IPv4 forwarding" warning for --net=none
Upstream-commit: 3ab9049be31c2c205cb9bce793e3bd640072e6e7
Component: engine
2016-05-23 11:11:21 -07:00
f3d8bc8e20
Merge pull request #22873 from jstarks/fix_bs_del
...
Windows: Work around Windows BS/DEL behavior
Upstream-commit: 0ac881b70582bce279db124f2cd89222c1857625
Component: engine
2016-05-23 11:10:33 -07:00
1f85a31589
Merge pull request #22878 from vdemeester/better-default-context
...
Rework usage of context.Context in api/client
Upstream-commit: 5f95750ab40ecc71b0424c399c35a42dc0965ad5
Component: engine
2016-05-23 13:43:08 -04:00
c0471a1614
Merge pull request #22884 from vdemeester/moving-daemon-horn
...
Move some image related methods & struct to smaller files
Upstream-commit: b316bc42fe1ad8edc709bf28975fb3a52e766344
Component: engine
2016-05-23 12:26:00 -04:00
dd19106ac3
Typo fix wiildcard -> wildcard
...
Signed-off-by: Alex Ellis <alexellis2@gmail.com >
Upstream-commit: 86d48aa111384539b0d2bd50353c4d4c40a5750a
Component: engine
2016-05-22 18:39:35 +01:00
c9241942c4
Merge pull request #22889 from thaJeztah/carry-22151-granular-vendoring
...
Allow granular vendoring
Upstream-commit: 07dc6bfb46e3cd30d01e027680e18a662806bd49
Component: engine
2016-05-22 18:30:59 +02:00
