0940f2e2b9
Merge pull request #18296 from jfrazelle/add-james
...
add james golick to names generator
Upstream-commit: 221d979e7b6fbc1c631370a8d44bc588b68df543
Component: engine
2015-11-30 10:00:21 -08:00
45a6d40e9f
Merge pull request #18303 from runcom/lxc-leftover
...
daemon: remove sysInitPath, lxc leftover
Upstream-commit: 360a10651188fcf79b0110265c3f2723637e11b7
Component: engine
2015-11-30 09:37:05 -08:00
132ab17e74
Merge pull request #18239 from jfrazelle/17783-fix-regex
...
Fix parsing of apparmor pcre syntax
Upstream-commit: 377e1d75f93101acbff7cf06df2c05a2df3b6760
Component: engine
2015-11-30 09:15:25 -08:00
fd34041b28
Merge pull request #18306 from runcom/add-test-suffix
...
integration-cli: add _test suffix to test file
Upstream-commit: 7bef4281103035373d97d5807893aafc81f21735
Component: engine
2015-11-30 17:02:15 +01:00
21928a9bde
Merge pull request #18226 from duglin/Issue18170
...
Fix for zero-sized layers
Upstream-commit: a26accfb5d52f81b6df339da36855b85d3a473fe
Component: engine
2015-11-30 09:57:37 -06:00
3820fd0625
Merge pull request #18272 from hqhq/hq_fix_kernel_memory
...
Fix kernel memory limit
Upstream-commit: f3ff09f5786fc74161b13ebb48299d07bb0847d2
Component: engine
2015-11-30 10:01:45 -05:00
14bb39d0a2
integration-cli: add _test suffix to test file
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1f0f41e8d7511999faad79866e2799f78956bb37
Component: engine
2015-11-30 11:33:57 +01:00
c116892cdb
daemon: remove sysInitPath, lxc leftover
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 1b726b29b21bbc1aebfe0f6b71dfd61145bdd6af
Component: engine
2015-11-30 10:04:13 +01:00
cd510fc600
Golint auto-generated file
...
Fix auto-generation script to golint auto-generated files.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: a7b73e57bc55ff63ccbe3a9ff879a25253292c9b
Component: engine
2015-11-30 16:34:07 +08:00
54560bdc1f
Update cgroup integration tests
...
Cgroup integtaion tests should cover:
- docker can run sucessfully with these options
- these cgroup options are set to HostConfig as expected
- these cgroup options are really set to cgroup files as expected
- other cases (wrong value, combinations etc..)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 0a426c47c84cb8aec714cce2c21e6c6696cbc8c4
Component: engine
2015-11-30 08:40:47 +08:00
bbfa3215a0
add james golick to names generator
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: bf66deeb080787c3bda9aa619d3cdb22c68bbee1
Component: engine
2015-11-29 10:40:12 -08:00
dfeea039e6
Fix kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: dd7b4fd651a6f9354efb991f6ce547a03729fa18
Component: engine
2015-11-28 09:47:25 +08:00
873d694f0a
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 4c3c3fedf81a47f9da1a92665ae53e81ce30db62
Component: engine
2015-11-27 17:10:09 +01:00
e754309ce0
Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test
...
Checkers on docker_cli_pull_local_test.go
Upstream-commit: a415b0c2208bd426df731491fe6e4714156f3527
Component: engine
2015-11-27 17:04:28 +01:00
c3cf7195f6
Merge pull request #17108 from coolljt0725/fix_remove_image
...
Fix docker rmi trying to remove a being used parent
Upstream-commit: b8c21783f0c7915779de3fa487f233ebc145738d
Component: engine
2015-11-26 12:21:30 -08:00
cb358947f2
Merge pull request #18232 from mqliang/defer
...
move defer statement for readability
Upstream-commit: 88aca3610fecdf790c4604ed705d31f8d17ef8e6
Component: engine
2015-11-26 12:20:55 -08:00
c93754a0f9
vendor: bump deps
...
bump runc/libcontainer to v0.0.5
bump runc deps to latest
bump docker/libnetwork to 04cc1fa0a89f8c407b7be8cab883d4b17531ea7d
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: 65900d7603368f045c904d178fab05a13c44a066
Component: engine
2015-11-26 16:29:59 +01:00
689c530381
Merge pull request #18262 from runcom/add-line
...
hack: make: .go-autogen: add blank line after build tag
Upstream-commit: 2adeef9d1d4a0cf1fb6b0d56dc246008d72f777e
Component: engine
2015-11-26 16:03:23 +01:00
af5191b5dd
hack: make: .go-autogen: add blank line after build tag
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: a1733c6575339e254f2b49625d597f46f883fe42
Component: engine
2015-11-26 13:16:39 +01:00
1cdb10c9d0
Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest
...
Use FROM docs/base:latest again
Upstream-commit: 9be2eea41593db2e6203097592e9347bb40c5637
Component: engine
2015-11-26 13:12:41 +01:00
b13551acbe
Merge pull request #18220 from mqliang/temvarible
...
remove unnecessary temporary variable
Upstream-commit: bb11900393df21002a7608c007c90438522be7dd
Component: engine
2015-11-26 11:40:02 +01:00
97d5f4d62b
Use FROM docs/base:latest again
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: ce5177cf4b175435a667aeced586f653a9203790
Component: engine
2015-11-26 20:20:46 +10:00
72a5c00834
Merge pull request #18252 from aaronlehmann/tarstream-readcloser
...
Make TarStream return an io.ReadCloser
Upstream-commit: 9ebf7dfae324d8fad524c9578ed850bf3b116d32
Component: engine
2015-11-25 21:35:21 -05:00
e8167fa92b
remove unnecessary temporary variable
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 478b773fe5aa7b9bdfc571d3e8f8bc3bc47826ea
Component: engine
2015-11-26 10:25:55 +08:00
a047f4a27c
Fix for zero-sized layers
...
Moved a defer up to a better spot.
Fixed TestUntarPathWithInvalidDest to actually fail for the right reason
Closes #18170
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 7bb9fc415ac50abf5f754005264bfe152eeca7d6
Component: engine
2015-11-25 18:02:03 -08:00
2d14ff7cb5
Fix docker rmi trying to remove a being used parent
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 0bbc9f1d2d0effcf33d82d24bbf97f30b90619de
Component: engine
2015-11-26 09:57:20 +08:00
75d1f1d370
Merge pull request #18234 from thaJeztah/revert-vendor-changes
...
docs: revert README changes in vendored files
Upstream-commit: 3e51aff852a7e014dee770c02b40f90a2ef07503
Component: engine
2015-11-25 17:37:04 -08:00
aa606769fe
Merge pull request #18245 from tonistiigi/tagstore-digest-adder
...
Validate adding digests to tagstore with go types
Upstream-commit: 8339c892e803c88a5269be29f76f5d74e30d5816
Component: engine
2015-11-25 17:36:33 -08:00
c88fa0bb83
Make TarStream return an io.ReadCloser
...
Currently, the resources associated with the io.Reader returned by
TarStream are only freed when it is read until EOF. This means that
partial uploads or exports (for example, in the case of a full disk or
severed connection) can leak a goroutine and open file. This commit
changes TarStream to return an io.ReadCloser. Resources are freed when
Close is called.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 21278efaee563b356851a530b08b0537fee095d7
Component: engine
2015-11-25 16:39:54 -08:00
c91b830a96
Validate adding digests to tagstore with go types
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 20e759ab56e9c17cfe0fbe839cdd4ac9ee6f0752
Component: engine
2015-11-25 15:06:51 -08:00
01bcd002ce
Merge pull request #18243 from jfrazelle/fix-test
...
fix consistetly failing TestContainerRestartSuccess
Upstream-commit: 49088b0b8947485dc8f639b1bb9e81b07b865516
Component: engine
2015-11-25 17:07:17 -05:00
22b751507a
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: f91115e3a26f612001bde5f55cd59c69f7243104
Component: engine
2015-11-25 13:04:59 -08:00
60f58722cf
Merge pull request #18213 from crawford/18212-fix-api-server
...
Revert "Return listenbuffer behavior"
Upstream-commit: 34228586530fb3c51c4faa8ec73b9e15926893ea
Component: engine
2015-11-25 10:49:31 -08:00
1fccc71442
Fix parsing of apparmor pcre syntax
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: c0f7fdc025da69283eb00d80bf47f4d47eeb0a65
Component: engine
2015-11-25 10:38:18 -08:00
7e8c2fe30e
Merge pull request #17799 from runcom/deprecate-hc-cont-start
...
Deprecate HostConfig at API container start
Upstream-commit: ad67f324cc59807918eea747cc110d39a2bc1ca2
Component: engine
2015-11-25 09:11:12 -08:00
265697d24d
Merge pull request #18223 from thaJeztah/fix-table-markup
...
Fix markup for markdown table
Upstream-commit: 9bd5fd892617c589606efda5e209e2400c6946d7
Component: engine
2015-11-25 16:26:53 +01:00
9d6bd6fa95
Merge pull request #18215 from mountkin/test-for-18181
...
add a test to make sure port is allowed in images filter
Upstream-commit: 1beb450fa68dd32e2ef6cab539f39ad86ea5e192
Component: engine
2015-11-25 10:14:09 -05:00
c05f5f5162
Merge pull request #18233 from moxiegirl/carry-17231
...
Moving prerequisite from #17231
Upstream-commit: aa4fa98ed77f80a9db5e8f7c23ef58a4537a72e1
Component: engine
2015-11-25 16:12:05 +01:00
d55f3e0dd1
revert README changes in vendored files
...
PR https://github.com/docker/docker/pull/17986
inadvertently included changes to some vendored files.
This reverts those changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: dd3634b3c1926cac2b714be4e7b5be49dfc0d0f2
Component: engine
2015-11-25 16:07:43 +01:00
2d2b79f090
Merge pull request #18209 from martingkelly/18207-deb-multiarch
...
install.sh: fix for multiarch deb/ubuntu
Upstream-commit: 1892556375ee4425e7c0a8e3e3cfb5f5e7a2c49c
Component: engine
2015-11-25 16:02:36 +01:00
f09258ddea
Merge pull request #17926 from HackToday/15896-fix-volume-options
...
Fixing the volume options doc
Upstream-commit: afaf288316d0cce4a2d02a51aaab0b8017bdac27
Component: engine
2015-11-25 06:57:05 -08:00
7dc8164a18
Merge pull request #18228 from bboreham/existent-spelling
...
Fix spelling 'non-existant' -> 'non-existent'
Upstream-commit: 06e4da9c5d6af18fe7e92482f5629dbcbdf56897
Component: engine
2015-11-25 15:52:17 +01:00
109d171010
Moving prerquisite from #17231
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 20f1a7b496fad1556ccc61f35d58533f885e0ab2
Component: engine
2015-11-25 06:51:23 -08:00
f919763365
Merge pull request #17231 from zelahi/9745-addapparmor-note
...
Adding note about apparmor install on Ubuntu
Upstream-commit: 1c3e4c5b9f53917998d94afb3e53bdbea16472c4
Component: engine
2015-11-25 06:45:42 -08:00
5cc8cf959e
move defer statement for readability
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 302325a3aaaae030f58c84bdaf88a5c8266af12c
Component: engine
2015-11-25 22:33:15 +08:00
89ca8a3104
Fix spelling of 'existent'
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
Upstream-commit: 899caaca9c990067d541231c6d288de89dbb79e7
Component: engine
2015-11-25 13:45:37 +00:00
eb58bc2fc0
Merge pull request #18227 from thaJeztah/fix-api-changes
...
docs: move API changes to the correct API version
Upstream-commit: 9cbfa7b00bd3b542632b40c5726316923d90cd18
Component: engine
2015-11-25 08:20:13 -05:00
7da657059d
docs: move API changes to the correct API version
...
These changes were made as part of https://github.com/docker/docker/pull/17478
but inadvertently added to the v1.21 API version.
Also added a short description to the API changelog.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a06d5273b3cb72f68fc32da26955842287314970
Component: engine
2015-11-25 14:10:18 +01:00
26c51ea4a2
docs: fixups for plugin drivers in docker info
...
Plugin drivers were added to docker info in
https://github.com/docker/docker/pull/17300
but not added to the example output in the online
docs.
Also fixed mixed tabs/spaces in the API documentation.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 0a7e45e95c9e554c73581def80881534800a2b28
Component: engine
2015-11-25 13:54:54 +01:00
7073afc49a
Fix markup for markdown table
...
Our tooling used to convert Markdown to HTML doesn't
properly handle '|' symbols embeded in code blocks
inside a table.
Changed the table to a plain HTML table as a workaround.
Also fixed indentation levels of two code examples.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: bfdd94b0a8f0641f7bced9d3089a78e9550a7b04
Component: engine
2015-11-25 12:38:15 +01:00
