beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20228 commits 14 branches 412 tags 338 MiB
Commit graph

20228 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Calavera
c84f5dfd74 Merge pull request #17438 from pmalmgren/17037-systemd226-cgroup 
Fix docker status incorrectly reports containerized
 2015-11-30 11:47:16 -08:00
Phil Estes
2a354790a6 Merge pull request #18241 from LK4D4/remove_listenbuffer 
Remove listenbuffer
 2015-11-30 14:37:14 -05:00
Jess Frazelle
e852959fad Merge pull request #18178 from jfrazelle/apparmor-we-meet-again 
Fix docker-default profile handing signals
 2015-11-30 11:34:34 -08:00
David Calavera
54733abba3 Merge pull request #18148 from aditirajagopal/16756-docker_api_info_test 
Checkers on integration-cli/docker_api_info_test
 2015-11-30 11:06:15 -08:00
Alexandre Beslic
0f0cf267e8 Merge pull request #18204 from mavenugo/dhb 
Configurable discovery ttl and heartbeat timer
 2015-11-30 11:00:53 -08:00
Jessica Frazelle
f8db9a09e0
check version for docker-default aa profile 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-30 10:18:12 -08:00
David Calavera
221d979e7b Merge pull request #18296 from jfrazelle/add-james 
add james golick to names generator
 2015-11-30 10:00:21 -08:00
Jess Frazelle
360a106511 Merge pull request #18303 from runcom/lxc-leftover 
daemon: remove sysInitPath, lxc leftover
 2015-11-30 09:37:05 -08:00
Alexander Morozov
377e1d75f9 Merge pull request #18239 from jfrazelle/17783-fix-regex 
Fix parsing of apparmor pcre syntax
 2015-11-30 09:15:25 -08:00
Alexander Morozov
a0251b2bbf Remove listenbuffer package 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-30 09:04:59 -08:00
Alexander Morozov
ca5795cef8 Remove usage of listenbuffer package 
It actually adds nothing to queuing requests.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-11-30 09:04:55 -08:00
Vincent Demeester
7bef428110 Merge pull request #18306 from runcom/add-test-suffix 
integration-cli: add _test suffix to test file
 2015-11-30 17:02:15 +01:00
Vincent Batts
a26accfb5d Merge pull request #18226 from duglin/Issue18170 
Fix for zero-sized layers
 2015-11-30 09:57:37 -06:00
Phil Estes
f3ff09f578 Merge pull request #18272 from hqhq/hq_fix_kernel_memory 
Fix kernel memory limit
 2015-11-30 10:01:45 -05:00
Antonio Murdaca
f187bdbb9b Merge pull request #18302 from WeiZhang555/lint-auto 
Golint auto-generated file
 2015-11-30 12:32:23 +01:00
Antonio Murdaca
1f0f41e8d7 integration-cli: add _test suffix to test file 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 11:33:57 +01:00
Antonio Murdaca
1b726b29b2 daemon: remove sysInitPath, lxc leftover 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-30 10:04:13 +01:00
Zhang Wei
a7b73e57bc Golint auto-generated file 
Fix auto-generation script to golint auto-generated files.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-11-30 16:34:07 +08:00
Qiang Huang
0a426c47c8 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>
 2015-11-30 08:40:47 +08:00
Jessica Frazelle
bf66deeb08
add james golick to names generator 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-29 10:40:12 -08:00
Sebastiaan van Stijn
dd25d2c3db Merge pull request #18281 from runcom/18199-followup 
integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s)
 2015-11-28 13:03:09 +01:00
Qiang Huang
dd7b4fd651 Fix kernel memory limit 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-11-28 09:47:25 +08:00
Antonio Murdaca
4c3c3fedf8 integration-cli: docker_cli_pull_local_test.go: remove not needed Commentf(s) 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-27 17:10:09 +01:00
Antonio Murdaca
a415b0c220 Merge pull request #18199 from aditirajagopal/16756-docker_cli_pull_local_test 
Checkers on docker_cli_pull_local_test.go
 2015-11-27 17:04:28 +01:00
Alexander Morozov
b8c21783f0 Merge pull request #17108 from coolljt0725/fix_remove_image 
Fix docker rmi trying to remove a being used parent
 2015-11-26 12:21:30 -08:00
Alexander Morozov
88aca3610f Merge pull request #18232 from mqliang/defer 
move defer statement for readability
 2015-11-26 12:20:55 -08:00
Alexander Morozov
0b5a28590f Merge pull request #18106 from runcom/bump-runc-libcontainer 
vendor: bump libcontainer and its deps
 2015-11-26 12:15:48 -08:00
Antonio Murdaca
65900d7603 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>
 2015-11-26 16:29:59 +01:00
Vincent Demeester
2adeef9d1d Merge pull request #18262 from runcom/add-line 
hack: make: .go-autogen: add blank line after build tag
 2015-11-26 16:03:23 +01:00
Antonio Murdaca
a1733c6575 hack: make: .go-autogen: add blank line after build tag 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2015-11-26 13:16:39 +01:00
Sebastiaan van Stijn
9be2eea415 Merge pull request #18259 from SvenDowideit/move-to-docs-base-latest 
Use FROM docs/base:latest again
 2015-11-26 13:12:41 +01:00
Arnaud Porterie
bb11900393 Merge pull request #18220 from mqliang/temvarible 
remove unnecessary temporary variable
 2015-11-26 11:40:02 +01:00
Sven Dowideit
ce5177cf4b Use FROM docs/base:latest again 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-11-26 20:20:46 +10:00
Brian Goff
9ebf7dfae3 Merge pull request #18252 from aaronlehmann/tarstream-readcloser 
Make TarStream return an io.ReadCloser
 2015-11-25 21:35:21 -05:00
mqliang
478b773fe5 remove unnecessary temporary variable 
Signed-off-by: mqliang <mqliang.zju@gmail.com>
 2015-11-26 10:25:55 +08:00
Doug Davis
7bb9fc415a 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>
 2015-11-25 18:02:03 -08:00
Lei Jitang
0bbc9f1d2d Fix docker rmi trying to remove a being used parent 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-11-26 09:57:20 +08:00
David Calavera
3e51aff852 Merge pull request #18234 from thaJeztah/revert-vendor-changes 
docs: revert README changes in vendored files
 2015-11-25 17:37:04 -08:00
David Calavera
8339c892e8 Merge pull request #18245 from tonistiigi/tagstore-digest-adder 
Validate adding digests to tagstore with go types
 2015-11-25 17:36:33 -08:00
Aaron Lehmann
21278efaee 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>
 2015-11-25 16:39:54 -08:00
Tonis Tiigi
20e759ab56 Validate adding digests to tagstore with go types 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2015-11-25 15:06:51 -08:00
Jess Frazelle
49088b0b89 Merge pull request #18243 from jfrazelle/fix-test 
fix consistetly failing TestContainerRestartSuccess
 2015-11-25 17:07:17 -05:00
Jessica Frazelle
f91115e3a2
fix consistetly failing TestContainerRestartSuccess on windows it looks up pids and does unixy things 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-25 13:04:59 -08:00
Michael Crosby
3422858653 Merge pull request #18213 from crawford/18212-fix-api-server 
Revert "Return listenbuffer behavior"
 2015-11-25 10:49:31 -08:00
Jessica Frazelle
c0f7fdc025
Fix parsing of apparmor pcre syntax 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
 2015-11-25 10:38:18 -08:00
David Calavera
ad67f324cc Merge pull request #17799 from runcom/deprecate-hc-cont-start 
Deprecate HostConfig at API container start
 2015-11-25 09:11:12 -08:00
Sebastiaan van Stijn
9bd5fd8926 Merge pull request #18223 from thaJeztah/fix-table-markup 
Fix markup for markdown table
 2015-11-25 16:26:53 +01:00
Brian Goff
1beb450fa6 Merge pull request #18215 from mountkin/test-for-18181 
add a test to make sure port is allowed in images filter
 2015-11-25 10:14:09 -05:00
Sebastiaan van Stijn
aa4fa98ed7 Merge pull request #18233 from moxiegirl/carry-17231 
Moving prerequisite from #17231
 2015-11-25 16:12:05 +01:00
Sebastiaan van Stijn
dd3634b3c1 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>
 2015-11-25 16:07:43 +01:00