e811e9784f
Merge pull request #22544 from Microsoft/jjh/terminate
...
Windows: Terminate on failed shutdown, fixes dockerd deadlock
2016-05-12 14:46:56 -07:00
95872b65fb
Merge pull request #22636 from sean-jc/fix-oom-killer-tests
...
Add the swapMemorySupport requirement to OOM tests
2016-05-12 14:41:55 -07:00
c95f1fcbd9
Merge pull request #22679 from cyli/bump-notary-version
...
Bump notary version up to 0.3.0 and re-vendor.
2016-05-12 14:38:07 -07:00
ab090291dd
Merge pull request #22707 from TimWolla/patch-1
...
User network does not work with IPv6
2016-05-12 23:27:57 +02:00
f6ecba1045
Clarify that --ip does not work with IPv6 in docker run
...
Closes docker/docker#22707
Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
2016-05-12 23:19:46 +02:00
2ae863c28f
Merge pull request #22683 from npcode/docs-no-request-status
...
docs: Remove RequestStatusCode
2016-05-12 21:29:45 +02:00
150009e9d8
Merge pull request #22630 from thaJeztah/refactor-overlay-compatibility
...
refactor overlay storage driver compatibility check
2016-05-12 12:00:57 -07:00
350832acfa
Merge pull request #22698 from cpuguy83/22612_fix_map_access
...
Fix concurrent map access in bytespipe
2016-05-12 11:51:54 -07:00
b5094fbd2d
Merge pull request #22333 from thaJeztah/update-label-description
...
RFC: Add "process" labels
2016-05-12 11:39:14 -07:00
e9117578a7
Merge pull request #22445 from yongtang/20936-22443-concurrent-connection
...
Docker pull/push with max concurrency limits.
2016-05-12 08:51:28 -07:00
194c72611d
Fix concurrent map access in bytespipe
...
When getting and returning a buffer, need to make sure to syncronize
access to the pools map.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-05-12 10:04:05 -04:00
475c37dd66
Merge pull request #22694 from allencloud/fix-typos-in-docs
...
docs: correct some typos
2016-05-12 14:35:39 +02:00
edf5e097a2
Merge pull request #22687 from haoshuwei/fix-docs-securitymd
...
Fixing security.md
2016-05-12 14:35:21 +02:00
7fd9f9964a
Merge pull request #22620 from yongtang/05092016-remove-deprecated-driver-specific-log-tags
...
Remove deprecated driver specific log tags
2016-05-12 13:20:07 +02:00
57e2a82355
fix typos in docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-05-12 18:38:02 +08:00
ec2b0c0889
Merge pull request #22682 from hqhq/hq_update_check
...
Update go-check
2016-05-12 12:09:36 +02:00
24a0f1f3e8
Merge pull request #22689 from thaJeztah/docs-update-menu-order
...
docs: update menu order in security section
2016-05-12 11:22:44 +02:00
067e54eeac
docs: update menu order in security section
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-05-12 11:19:53 +02:00
a14e85c40d
Merge pull request #22579 from jfrazelle/docs-add-security-non-events
...
docs: add security non-events
2016-05-12 11:17:47 +02:00
73d96a6b17
Fixing security.md
...
Signed-off-by: Hao Shu Wei <haoshuwei1989@163.com>
2016-05-12 16:52:03 +08:00
84a6818b11
Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests
...
Reimplement some builder integration tests as unit tests
2016-05-12 10:29:39 +02:00
6094be63ac
Bump notary version up to 0.3.0 and re-vendor.
...
Signed-off-by: cyli <cyli@twistedmatrix.com>
2016-05-11 22:57:51 -07:00
aed525384a
docs: Remove RequestStatusCode
...
The requests doesn't include RequestStatusCode field.
Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
2016-05-12 14:27:22 +09:00
c273163e80
Merge pull request #22672 from kevinmeredith/correct_trapped_signals
...
Correct docs for a docker container's clean-up.
2016-05-12 14:15:39 +10:00
7368e41c07
Docker pull/push with max concurrency limits.
...
This fix tries to address issues raised in #20936 and #22443
where `docker pull` or `docker push` fails because of the
concurrent connection failing.
Currently, the number of maximum concurrent connections is
controlled by `maxDownloadConcurrency` and `maxUploadConcurrency`
which are hardcoded to 3 and 5 respectively. Therefore, in
situations where network connections don't support multiple
downloads/uploads, failures may encounter for `docker push`
or `docker pull`.
This fix tries changes `maxDownloadConcurrency` and
`maxUploadConcurrency` to adjustable by passing
`--max-concurrent-uploads` and `--max-concurrent-downloads` to
`docker daemon` command.
The documentation related to docker daemon has been updated.
Additional test case have been added to cover the changes in this fix.
This fix fixes #20936 . This fix fixes #22443 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-11 19:44:54 -07:00
ed868a2e11
Update go-check
...
It includes a small improvement, we hit test timeout sometimes
for some reason, print out the timed out case would be very
helpful.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-05-12 09:19:23 +08:00
f7c79cdeae
Merge pull request #22455 from Anvil/bash-completion-failglob
...
docker bash completions fails when failglob is enabled
2016-05-11 13:08:48 -10:00
b3a1ae02a9
Merge pull request #22353 from Microsoft/jjh/dockercp
...
Windows: docker cp platform semantically consistent paths
2016-05-11 13:08:24 -10:00
78e9f2e9e7
Merge pull request #22368 from tianon/wheezy-lts
...
Update contrib/mkimage/debootstrap to include wheezy-lts
2016-05-11 12:49:26 -10:00
bacce5ef4f
Merge pull request #22365 from dnephin/fix_selinux_for_dockerd
...
Update the binary name in docker-engine-selinux/docker.fc
2016-05-11 12:44:55 -10:00
28452ca783
Merge pull request #22356 from allencloud/close-http-response-body-when-attaching
...
close http response body when attaching
2016-05-11 12:44:35 -10:00
dc430944b9
Merge pull request #22262 from kencochrane/fix_release_deb
...
Create the correct directory structure for apt-ftparchive
2016-05-11 12:38:12 -10:00
18eeb39985
Reimplementing builder integration tests as unit tests
...
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-11 22:13:39 +02:00
ef7cd21766
Correct docs for a docker container's clean-up.
...
The 'Unix Signals' (https://en.wikipedia.org/wiki/Unix_signal#Handling_signals ) wiki explains that:
> 'There are two signals which cannot be intercepted and handled: SIGKILL and SIGSTOP.'
Signed-off-by: kevinmeredith <kevin.m.meredith@gmail.com>
2016-05-11 14:58:23 -04:00
730b974c64
Merge pull request #22637 from LK4D4/simplify_tcp_proxy
...
pkg/proxy: remove unused 'transfered' variable
2016-05-11 20:56:31 +02:00
e421668b1b
Merge pull request #21708 from tianon/InRelease
...
Also generate "InRelease" files for newer APT clients
2016-05-11 13:21:15 -04:00
4c654eeea2
Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist
...
docs: update seccomp whitelist
2016-05-11 18:59:53 +02:00
2cddd1cd1f
docs: update seccomp whitelist
...
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e899
2016-05-11 18:45:27 +02:00
3710f9074e
Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags
...
Update deprecated docs for cli flags removal.
2016-05-11 18:05:52 +02:00
fd3a795a47
Merge pull request #22278 from runcom/fixies-dockerd
...
Fixies dockerd
2016-05-11 07:57:00 -07:00
da74f9653d
Merge pull request #22642 from amitkris/uprev_gozfs
...
update go-zfs to include Solaris support
2016-05-11 07:41:17 -07:00
0a4de93e13
Update deprecated docs for cli flags removal.
...
The old command line options have been deprecated in 1.8.0 and
eventually removed in 1.10.0 through PR #17724 , though the
deprecated.md still shows `Target For Removal In Release`.
This fix updates the deprecated.md and changes
`Target For Removal In Release` to `Removed In Release`.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-05-11 06:48:07 -07:00
1ac1b78b3a
contrib: init: use dockerd
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-11 11:00:11 +02:00
af60a9e599
Merge pull request #22511 from crosbymichael/update-runc-containerd
...
Update runc and containerd deps
2016-05-10 15:06:23 -07:00
34175eb47e
pkg/proxy: remove unused 'transfered' variable
...
That simplified code a bit
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-10 14:33:21 -07:00
efb3946171
update go-zfs to include Solaris support
...
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
2016-05-10 13:51:03 -07:00
a4bb2c7d7a
Merge pull request #22634 from thaJeztah/dj-jazzy-jess
...
Add Jess to alumni
2016-05-10 22:08:56 +02:00
adabb51311
Add the swapMemorySupport requirement to OOM tests
...
Add the swapMemorySupport requirement to all tests related to the OOM killer. The --memory option has the subtle side effect of defaulting --memory-swap to double the value of --memory. The OOM killer doesn't kick in until the container exhausts memory+swap, and so without the memory swap cgroup the tests will timeout due to swap being effectively unlimited.
Document the default behavior of --memory-swap in the docker run man page.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
2016-05-10 11:28:00 -07:00
feacb1205b
Windows: Terminate on failed shutdown
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-10 10:09:50 -07:00
59db39c5c8
Merge pull request #22619 from jterry75/master
...
Adds a correct error string for network validation
2016-05-10 10:02:54 -07:00
Alexander Morozov
Sebastiaan van Stijn
Tim Düsterhus
John Howard
Arnaud Porterie
Brian Goff
Vincent Demeester
allencloud
Sebastiaan van Stijn
Hao Shu Wei
cyli
Yi EungJun
Sven Dowideit
Yong Tang
Qiang Huang
Tomasz Kopczynski
kevinmeredith
Antonio Murdaca
Tibor Vass
Antonio Murdaca
Alexander Morozov
Amit Krishnan
Sean Christopherson
John Howard