bc7977060e
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
Upstream-commit: 078b8e54e4429f838ff26ddace34854167fe0b42
Component: engine
2015-06-05 10:27:58 -07:00
9eb2d545d0
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 0adfb908a682e679b54f511fe89e668d6e676dda
Component: engine
2015-06-05 09:50:30 -07:00
3ebd8c1a62
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0c84604f5458bc38b793e5bcdf86624eef3e3184
Component: engine
2015-06-04 13:56:40 -07:00
cd63c659d6
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 9ec5e4f7df15f5c1e9862f71fe3079188fff0106
Component: engine
2015-06-04 09:02:14 -07:00
e28afd6060
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 6945ac2d02adbe2931c9e8756ecbb7496b43081a
Component: engine
2015-06-03 23:13:56 +02:00
2d31933cd6
Merge pull request #13165 from ahmetalpbalkan/durations
...
Allow duration strings as --since/--until
Upstream-commit: f18ce101fbdf6c62a5643f826ed69a8abb843d87
Component: engine
2015-06-03 22:14:42 +02:00
cc362d8cba
Merge pull request #13703 from runcom/13691-container-ps-regression
...
Do not omit empty json field in /containers/json api response
Upstream-commit: a29633f6878369081dcdb9886ca7e24a082d0393
Component: engine
2015-06-03 12:30:12 -07:00
26bf655315
Merge pull request #13645 from calavera/fix_stats_flaky_test
...
Fix stats flaky test.
Upstream-commit: c962f53a3e66dcfaf6c335df805d99cb5784245f
Component: engine
2015-06-03 12:05:43 -07:00
90d04ee342
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 725f34151c5f86b0b50f6e5601223e6da194af1b
Component: engine
2015-06-03 18:53:40 +02:00
376792022a
Fix nat integration tests
...
This removes complexity of current implementation and makes the test
correct and assert the right things.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 4f4209788378e580247d4baff65ae5b58afac4ba
Component: engine
2015-06-02 18:21:16 -07:00
0fb31101e8
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
Upstream-commit: 6c42b3947a6ad91fc487ba34fec634e9f5c48aea
Component: engine
2015-06-02 14:12:22 -07:00
add0a8eb5b
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 4e3b21f99e7fb7fac0075be2e7190d5f07c9ee66
Component: engine
2015-06-02 21:02:47 +00:00
85f67e34a6
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
Upstream-commit: 7d33bc0bec14cedff0829a3e77c029c875413ec0
Component: engine
2015-06-02 11:05:22 -07:00
35a3ad8b0c
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
Upstream-commit: 2de2782fe89cf2793e868161985a3d7f764520df
Component: engine
2015-06-02 09:40:55 -07:00
66c03ea423
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
Upstream-commit: 39eec4c25bce6291534f9524dc52de65787d5b6e
Component: engine
2015-06-02 18:01:19 +02:00
93fe2d99ac
test: Skip TestDevicePermissions on lxc
...
Closes : #13641
Signed-off-by: Zefan Li <lizefan@huawei.com >
Upstream-commit: e55649192ef9c947e9c90018c71bbc0a8d99a546
Component: engine
2015-06-02 10:27:54 +08:00
25eb4c5026
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
Upstream-commit: aa8d8fdc0cfe07ce4e4976dc41a3fdb86ebcfc66
Component: engine
2015-06-01 15:59:57 -07:00
c13e5475eb
Fix stats flaky test.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 4fde1cb6956a5dab266a745235d12f4442eedf7c
Component: engine
2015-06-01 14:05:26 -07:00
85e6643580
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
Upstream-commit: cd80a61cc1dd6868eef77852b898f1d25c06641b
Component: engine
2015-06-01 14:04:33 -07:00
fcc50c1993
Merge pull request #13557 from ewindisch/apparmor-unshare-priv
...
Expand unshare test to include privileged test
Upstream-commit: 71d960d4559cdbae4ff7913441685f29279a1ca2
Component: engine
2015-06-01 15:43:37 -04:00
4f79291859
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 8232312c1e705753d3db82dca3d9bb23e59c3b52
Component: engine
2015-06-01 12:39:28 -07:00
c86ef1ca0b
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
Upstream-commit: a7005c44b5ddfd44c2a54c6d60af52e3fecfaf72
Component: engine
2015-06-01 09:40:04 -07:00
f9a83491c5
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
Upstream-commit: 6fb454b9f08249449a343ca56348b02ae41ac9c5
Component: engine
2015-06-01 09:30:04 -07:00
c1e042a6e9
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
Upstream-commit: d37aad170ffe75eeaaea07d52863a6159417e5d6
Component: engine
2015-06-01 12:29:45 -04:00
f605824756
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
Upstream-commit: f2154a5a6b2d68258322a9a0677e14b910e7b47d
Component: engine
2015-05-30 19:49:38 +02:00
adc8e86b26
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 96123a1fd5c2779ccd7dd722a1fa4196e91dd716
Component: engine
2015-05-31 01:25:51 +08:00
cc848c594e
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
2015-05-30 07:48:46 -07:00
1d47fe7076
Allow .dockerignore to ignore everything
...
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.
Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.
Closes : #13417
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 82ea6ed2bc33ac1ec2ad2bd8d4a098031dd77095
Component: engine
2015-05-30 04:16:00 -07:00
77c76a3170
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c61fa8471a567b4890e0861f8aaff91a68c42e4f
Component: engine
2015-05-30 11:31:51 +02:00
64ffe806a7
Fix issue #10184 .
...
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.
Signed-off-by: David R. Jenni <david.r.jenni@gmail.com >
Upstream-commit: c913c9921b7caa11e8500d2ebb4fa97303c876be
Component: engine
2015-05-30 11:09:47 +02:00
4610cc7a2b
Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown
...
Ensure all the running containers are killed on daemon shutdown
Upstream-commit: 04c6f09fbdf60c7765cc4cb78883faaa9d971fa5
Component: engine
2015-05-29 16:45:57 -07:00
a03d351804
Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all
...
fix bug with rmi multiple tag
Upstream-commit: eaa9c1b97e3b28c6e2a16c7e593238bb43e1f9dc
Component: engine
2015-05-29 15:10:22 -07:00
4f53f1bb13
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
Upstream-commit: 4389fc8bf975a5df567c8431dda82d19a09733a3
Component: engine
2015-05-29 15:05:21 -07:00
9712652e10
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 185f392691c40fc4cb6ea16373a92a03f3d0b0f2
Component: engine
2015-05-29 14:04:06 -07:00
2b62e414ad
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: ec97f414657189f2ce95d6b5bda26aa9d206b705
Component: engine
2015-05-29 22:38:36 +02:00
6226136075
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 15134a3320fbacee36e86a0342e7ffb49285f297
Component: engine
2015-05-29 22:38:09 +02:00
5fa31c9647
Merge pull request #13598 from calavera/fix_windows_build
...
Do not require cgroups capabilities on windows to run the integration tests.
Upstream-commit: 4c9fd72a91543bff32241198704f77fa38eaf5c8
Component: engine
2015-05-29 12:57:40 -07:00
9a7a5b0edf
Do not require cgroups capabilities on windows to run the integration tests.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a9141012966db62b36b7d3d1df7af877bbd2d172
Component: engine
2015-05-29 11:42:40 -07:00
a4e456d439
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: b372f9f224d2dcc2a7beca55751782060dc9b12f
Component: engine
2015-05-29 10:00:22 -07:00
fefb50c37a
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: 1392f99a974bd03848b1080a263db2b7def2fc02
Component: engine
2015-05-28 14:54:12 -07:00
21fa1411f6
Expand unshare test to include privileged test
...
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: e58161fedcb8718c3880eb1778e29468e4cb72bd
Component: engine
2015-05-28 16:49:48 -04:00
9749c4b6ff
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
Upstream-commit: 617a0c2fde69f2954c2d8959e23e1459636f753e
Component: engine
2015-05-28 11:09:02 -07:00
2fdedbf13a
Merge pull request #13529 from hqhq/hq_skip_cgroup_test
...
Skip test if not have Cpu quota or Cpu period
Upstream-commit: 5bb6262d88356f12e280bdcaf400fdea3d46d525
Component: engine
2015-05-28 10:57:32 -07:00
781e46f9bc
Skip test if not have Cpu quota or Cpu period
...
Closes : #13522
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 34e5b6af19b916ec0debcc8bcb76313302b77a27
Component: engine
2015-05-28 14:59:58 +08:00
a7ae3fbbff
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
Upstream-commit: 26650e2cccc72bcc7d62e3208e3a69316272e883
Component: engine
2015-05-27 10:22:31 -07:00
d177b20750
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
Upstream-commit: 2029257e3cfd524b5fec0288eef039f182e460f7
Component: engine
2015-05-27 08:44:11 -07:00
81ebc3c70c
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
Upstream-commit: f3e56420a311378de030f7e3240fbdf6295c0b7e
Component: engine
2015-05-27 11:10:36 -04:00
b97117116a
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
Upstream-commit: 3f66f6f2f066d46f554deec55284377ee726a028
Component: engine
2015-05-27 13:59:40 +02:00
0767c7dcb9
Remove unused code
...
As far as I see, it's a dead code.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: a34cb321865c16ac42a12fe32fa3c8c4a5ffd263
Component: engine
2015-05-27 22:39:02 +08:00
49dc08b2f2
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: b3e8ab3021d2021202e14b912e7fdbfede4c7c20
Component: engine
2015-05-26 22:22:03 -04:00
