toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,178 Commits 3 Branches 295 Tags
58e7931a34934de8757575acceab26a864612e7d
Commit Graph
24178 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Stefan J. Wernli 58e7931a34 Fixing Windows update logic. 
Removing the call to Shutdown from within Signal in order to rely on waitExit handling the exit of the process.

Signed-off-by: Stefan J. Wernli <swernli@microsoft.com>
Upstream-commit: a5b64f2847501bc377c77a989df060646f2d87f8
Component: engine
 2016-05-12 17:45:53 -07:00
Alexander Morozov 6a16ddef16 Merge pull request #22279 from WeiZhang555/wait-channel 
Remove WaitRunning
Upstream-commit: cf783266ff314a236d3635e86a43d89677ac99ad
Component: engine
 2016-05-12 14:56:55 -07:00
Alexander Morozov e7146eaec9 Merge pull request #22544 from Microsoft/jjh/terminate 
Windows: Terminate on failed shutdown, fixes dockerd deadlock
Upstream-commit: e811e9784fd95069e9d5e14960e04cb0499ccd1d
Component: engine
 2016-05-12 14:46:56 -07:00
Alexander Morozov b511f6b16d Merge pull request #22636 from sean-jc/fix-oom-killer-tests 
Add the swapMemorySupport requirement to OOM tests
Upstream-commit: 95872b65fb65bcc275b2fa141b6a991ee085a41a
Component: engine
 2016-05-12 14:41:55 -07:00
Alexander Morozov 687f64e55c Merge pull request #22679 from cyli/bump-notary-version 
Bump notary version up to 0.3.0 and re-vendor.
Upstream-commit: c95f1fcbd9d6acc02c9af5fd62d21921b0150cd2
Component: engine
 2016-05-12 14:38:07 -07:00
Sebastiaan van Stijn 8797b94c38 Merge pull request #22707 from TimWolla/patch-1 
User network does not work with IPv6
Upstream-commit: ab090291dd15c76687672fec10eb9f4106c1cb21
Component: engine
 2016-05-12 23:27:57 +02:00
Tim Düsterhus cc4806d5b5 Clarify that --ip does not work with IPv6 in docker run 
Closes docker/docker#22707

Signed-off-by: Tim Düsterhus <tim@bastelstu.be>
Upstream-commit: f6ecba104556f4c68b8ad11ee8c2e6b2a27b87ff
Component: engine
 2016-05-12 23:19:46 +02:00
Sebastiaan van Stijn 7995f3c6bb Merge pull request #22683 from npcode/docs-no-request-status 
docs: Remove RequestStatusCode
Upstream-commit: 2ae863c28fdae1da9794942c90efa9f217bccd83
Component: engine
 2016-05-12 21:29:45 +02:00
Alexander Morozov 2aeee33813 Merge pull request #22630 from thaJeztah/refactor-overlay-compatibility 
refactor overlay storage driver compatibility check
Upstream-commit: 150009e9d8dbde08d15e0a72c1022f867860f57e
Component: engine
 2016-05-12 12:00:57 -07:00
Alexander Morozov 4b65a9405b Merge pull request #22698 from cpuguy83/22612_fix_map_access 
Fix concurrent map access in bytespipe
Upstream-commit: 350832acfa2f90bd4d3c280dce02843761d6f876
Component: engine
 2016-05-12 11:51:54 -07:00
John Howard 5ca095f66f Merge pull request #22333 from thaJeztah/update-label-description 
RFC: Add "process" labels
Upstream-commit: b5094fbd2dee6c2db99be5d4a7a7194e1c81b133
Component: engine
 2016-05-12 11:39:14 -07:00
Arnaud Porterie 3af8464259 Merge pull request #22445 from yongtang/20936-22443-concurrent-connection 
Docker pull/push with max concurrency limits.
Upstream-commit: e9117578a7837eda31d690d5e51d09d43a6a8fca
Component: engine
 2016-05-12 08:51:28 -07:00
Brian Goff fbe4a4ca43 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>
Upstream-commit: 194c72611d5053f1e05dd020d02989dec872a06b
Component: engine
 2016-05-12 10:04:05 -04:00
Vincent Demeester 5b0da6166c Merge pull request #22694 from allencloud/fix-typos-in-docs 
docs: correct some typos
Upstream-commit: 475c37dd66ce4b2f3994ac61a4494950e43873b9
Component: engine
 2016-05-12 14:35:39 +02:00
Vincent Demeester a6e840fdce Merge pull request #22687 from haoshuwei/fix-docs-securitymd 
Fixing security.md
Upstream-commit: edf5e097a2ee1e1b90a6634d6fa6cf1547dff65c
Component: engine
 2016-05-12 14:35:21 +02:00
Vincent Demeester 58545d95ec Merge pull request #22620 from yongtang/05092016-remove-deprecated-driver-specific-log-tags 
Remove deprecated driver specific log tags
Upstream-commit: 7fd9f9964aa110b22b68c45be6148aa298abeb5c
Component: engine
 2016-05-12 13:20:07 +02:00
allencloud abeea999e4 fix typos in docs 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 57e2a82355c15005875fedc733dc45081af5a2d9
Component: engine
 2016-05-12 18:38:02 +08:00
Vincent Demeester ad24086538 Merge pull request #22682 from hqhq/hq_update_check 
Update go-check
Upstream-commit: ec2b0c08890a57a0d4e5ed9991bfc845b39b706d
Component: engine
 2016-05-12 12:09:36 +02:00
Vincent Demeester 581f250349 Merge pull request #22689 from thaJeztah/docs-update-menu-order 
docs: update menu order in security section
Upstream-commit: 24a0f1f3e89476f29c22e48d1e5cbdcc39611958
Component: engine
 2016-05-12 11:22:44 +02:00
Sebastiaan van Stijn c143020222 docs: update menu order in security section 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 067e54eeacf691c49cc169b80acd814c62a504d0
Component: engine
 2016-05-12 11:19:53 +02:00
Sebastiaan van Stijn 030412355e Merge pull request #22579 from jfrazelle/docs-add-security-non-events 
docs: add security non-events
Upstream-commit: a14e85c40d210252096bfb6bbef1e7b66e2e2bfd
Component: engine
 2016-05-12 11:17:47 +02:00
Hao Shu Wei f4d78f4d50 Fixing security.md 
Signed-off-by: Hao Shu Wei <haoshuwei1989@163.com>
Upstream-commit: 73d96a6b17b1fb8af71dc68d78e50f88b89f4167
Component: engine
 2016-05-12 16:52:03 +08:00
Vincent Demeester e20fdf0d4f Merge pull request #22622 from tkopczynski/20784-builder-intg2unit-tests 
Reimplement some builder integration tests as unit tests
Upstream-commit: 84a6818b11e6bf74d13222d0df2fe7d1ae811bb6
Component: engine
 2016-05-12 10:29:39 +02:00
cyli f15ebde7e0 Bump notary version up to 0.3.0 and re-vendor. 
Signed-off-by: cyli <cyli@twistedmatrix.com>
Upstream-commit: 6094be63ac3d29c23024daa2152719b653c78092
Component: engine
 2016-05-11 22:57:51 -07:00
Yi EungJun da9495f14d docs: Remove RequestStatusCode 
The requests doesn't include RequestStatusCode field.

Signed-off-by: Yi EungJun <eungjun.yi@navercorp.com>
Upstream-commit: aed525384a8c1db1b3b9960ead49586836536785
Component: engine
 2016-05-12 14:27:22 +09:00
Sven Dowideit 7c39596909 Merge pull request #22672 from kevinmeredith/correct_trapped_signals 
Correct docs for a docker container's clean-up.
Upstream-commit: c273163e80da5f5895db1dc1102a470ec45e0a69
Component: engine
 2016-05-12 14:15:39 +10:00
Yong Tang be88ed49c5 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>
Upstream-commit: 7368e41c07c21a1e2c6a49abecd1c2fc76404e49
Component: engine
 2016-05-11 19:44:54 -07:00
Qiang Huang ac0ab24166 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>
Upstream-commit: ed868a2e119ded10cdc794e2d109210c8a6b0546
Component: engine
 2016-05-12 09:19:23 +08:00
Arnaud Porterie 99e89dfbb3 Merge pull request #22455 from Anvil/bash-completion-failglob 
docker bash completions fails when failglob is enabled
Upstream-commit: f7c79cdeae67cec70c5257e808cb51eb7a90d35c
Component: engine
 2016-05-11 13:08:48 -10:00
Arnaud Porterie 13d28f3181 Merge pull request #22353 from Microsoft/jjh/dockercp 
Windows: docker cp platform semantically consistent paths
Upstream-commit: b3a1ae02a91d93efdface95ce7ed131dc397dedd
Component: engine
 2016-05-11 13:08:24 -10:00
Arnaud Porterie b47a34c25a Merge pull request #22368 from tianon/wheezy-lts 
Update contrib/mkimage/debootstrap to include wheezy-lts
Upstream-commit: 78e9f2e9e74a0c25318054ed21c539acfb44e235
Component: engine
 2016-05-11 12:49:26 -10:00
Arnaud Porterie fee867dae4 Merge pull request #22365 from dnephin/fix_selinux_for_dockerd 
Update the binary name in docker-engine-selinux/docker.fc
Upstream-commit: bacce5ef4f77acc9450e46bc7a4ca8ad3330b134
Component: engine
 2016-05-11 12:44:55 -10:00
Arnaud Porterie e4da61ff20 Merge pull request #22356 from allencloud/close-http-response-body-when-attaching 
close http response body when attaching
Upstream-commit: 28452ca78346cf8824ea71be35b4773f96405b1a
Component: engine
 2016-05-11 12:44:35 -10:00
Arnaud Porterie 3f6678c440 Merge pull request #22262 from kencochrane/fix_release_deb 
Create the correct directory structure for apt-ftparchive
Upstream-commit: dc430944b9682b0f46806dcb7bd733d25e2b6f31
Component: engine
 2016-05-11 12:38:12 -10:00
Tomasz Kopczynski af05fef951 Reimplementing builder integration tests as unit tests 
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: 18eeb399852b7efe9459a1d77b0a5032a6b88bba
Component: engine
 2016-05-11 22:13:39 +02:00
kevinmeredith 7bad1decfe 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>
Upstream-commit: ef7cd217663c7f6bff5f1d49461c004e86fed867
Component: engine
 2016-05-11 14:58:23 -04:00
Antonio Murdaca db5abbb3ee Merge pull request #22637 from LK4D4/simplify_tcp_proxy 
pkg/proxy: remove unused 'transfered' variable
Upstream-commit: 730b974c641242cedd96d5982495261aa7ba5c81
Component: engine
 2016-05-11 20:56:31 +02:00
Tibor Vass 624bb38952 Merge pull request #21708 from tianon/InRelease 
Also generate "InRelease" files for newer APT clients
Upstream-commit: e421668b1bdd611e49cd268341e75d9f5e8801c2
Component: engine
 2016-05-11 13:21:15 -04:00
Vincent Demeester db8ad55d48 Merge pull request #22669 from thaJeztah/docs-update-seccomp-whitelist 
docs: update seccomp whitelist
Upstream-commit: 4c654eeea209b9770071fe190d27976622298cdd
Component: engine
 2016-05-11 18:59:53 +02:00
Sebastiaan van Stijn d537ac63ac docs: update seccomp whitelist 
the 'modify_ldt' was listed as "blocked by default",
but was whitelisted in 13a9d4e8993997b2bf9be7e96a8d7978a73d0b9b

this updates the documentation to reflect this

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 2cddd1cd1f3135f36f6afcc84ddfda904aeee3b5
Component: engine
 2016-05-11 18:45:27 +02:00
Sebastiaan van Stijn eb47def058 Merge pull request #22666 from yongtang/05112016-update-deprecated-docs-cli-flags 
Update deprecated docs for cli flags removal.
Upstream-commit: 3710f9074e7cb752def69b1b80e4af3e6ed87daf
Component: engine
 2016-05-11 18:05:52 +02:00
Alexander Morozov 906e7550b5 Merge pull request #22278 from runcom/fixies-dockerd 
Fixies dockerd
Upstream-commit: fd3a795a478cec71d2c9fd2178c67482f04ef029
Component: engine
 2016-05-11 07:57:00 -07:00
Alexander Morozov 958502d650 Merge pull request #22642 from amitkris/uprev_gozfs 
update go-zfs to include Solaris support
Upstream-commit: da74f9653dc11c28e0b70267a2882628945051e9
Component: engine
 2016-05-11 07:41:17 -07:00
Yong Tang 50921875d5 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>
Upstream-commit: 0a4de93e1371a0d62ca6f3a5121368d7ecfde3fe
Component: engine
 2016-05-11 06:48:07 -07:00
Antonio Murdaca 97e6cef981 contrib: init: use dockerd 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 1ac1b78b3a771c562d9cfa91c14f8a494c3723c1
Component: engine
 2016-05-11 11:00:11 +02:00
Alexander Morozov d3b9fbad27 Merge pull request #22511 from crosbymichael/update-runc-containerd 
Update runc and containerd deps
Upstream-commit: af60a9e599543daa70da6d5d3b07343aa780c3ad
Component: engine
 2016-05-10 15:06:23 -07:00
Alexander Morozov a24c6ed1b5 pkg/proxy: remove unused 'transfered' variable 
That simplified code a bit

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 34175eb47ef5de023b68cef5af529b74c68b3ab3
Component: engine
 2016-05-10 14:33:21 -07:00
Amit Krishnan 3314e541a1 update go-zfs to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
Upstream-commit: efb3946171ffa30b716a0614e8037c6b0e699771
Component: engine
 2016-05-10 13:51:03 -07:00
Sebastiaan van Stijn 1a0db3e886 Merge pull request #22634 from thaJeztah/dj-jazzy-jess 
Add Jess to alumni
Upstream-commit: a4bb2c7d7a1da18c26626467f124d5532a9f927e
Component: engine
 2016-05-10 22:08:56 +02:00
Sean Christopherson 3ff3d68824 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>
Upstream-commit: adabb51311ecac031bd72378c5ed1669d1835d40
Component: engine
 2016-05-10 11:28:00 -07:00