unclejack
7981f6d0c0
pkg/ioutils: lower bufReader reset timeout
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: f9df813a992505ba2b37fad843ab943347d3ef11
Component: engine
2015-08-28 23:13:02 +03:00
Doug Davis
ff33b3e79f
More httputil tests for the docker header
...
follow-on to #15911
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 5e540bdc132669dfb8c13ae2796104a03aca6287
Component: engine
2015-08-28 12:16:37 -07:00
Vincent Demeester
33e7393fb4
Update shell completion on docker ps for ancestor
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 672bae2dc0af6bce3ffc7a1144a22fb740a8e013
Component: engine
2015-08-28 20:56:52 +02:00
Josh Hawn
f6d5f51a76
[daemon] Refactor image_delete.go
...
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
Upstream-commit: 111d2f348767692a34366ff5cd01f607cf54ad57
Component: engine
2015-08-28 11:01:24 -07:00
Sebastiaan van Stijn
aaf90d6259
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
Upstream-commit: b1cb1b1df493b3e0b739b9f374b6c82e306dede8
Component: engine
2015-08-28 19:47:43 +02:00
Sebastiaan van Stijn
4c1379a7d8
Merge pull request #15872 from lyndaoleary/find-an-issue-style-updates
...
Style updates to find an issue page
Upstream-commit: 279bbbedb2a8a3ddb9da5d5b3e82dbcc073e5a09
Component: engine
2015-08-28 19:18:19 +02:00
Aaron Lehmann
7ee1aa79e9
Make the broadcaster write messages to the observers in the same units they were written to the broadcaster
...
This means the writing to a WriteFlusher will flush in the same places
as it would if the broadcaster wasn't sitting in front of it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 317a5462e428fab6248fe3b028822250c8c9ff7f
Component: engine
2015-08-28 10:09:00 -07:00
Shijiang Wei
6190aee4a2
abstract the string slice struct to stringutils package
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: ea4a06740b6d4579f77507c1d7e0897a870fd72d
Component: engine
2015-08-29 01:08:40 +08:00
Alexander Morozov
aa8f27039b
Merge pull request #15902 from SvenDowideit/add-more-tests-for-parsehost
...
Exploring the parsehost using unit tests
Upstream-commit: 50bcf17c39e96c1032eac9e8a450533f84129220
Component: engine
2015-08-28 09:14:35 -07:00
David Calavera
2eb78e33c8
Merge pull request #15910 from mimoralea/patch-1
...
Typo fix then -> than
Upstream-commit: e6e210164e48684c80008bbcce917de349253758
Component: engine
2015-08-28 18:09:26 +02:00
Alexander Morozov
87ee7b8140
Merge pull request #15911 from calavera/carry_14296
...
[Carry 14296] Increased test coverage of pkg/httputils
Upstream-commit: 2a66beef7f66583c9d69b8de192abd25dca2ceaa
Component: engine
2015-08-28 09:04:43 -07:00
Miguel Morales
eeab72d8f5
Typo fix then -> than
...
Signed-off-by: Miguel Morales <mimoralea@hp.com >
Upstream-commit: 95e3a4ca6d7635e11d606a1011e0a55146c68460
Component: engine
2015-08-28 10:44:39 -05:00
David Calavera
d5c2dfe3ee
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
Upstream-commit: 433956cc47c4cf7a52068c0518bd30ad044fa3b7
Component: engine
2015-08-28 17:34:36 +02:00
Alexander Morozov
5950954f43
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
Upstream-commit: 6caaa8a63544c052d757aecee93d3488b7b3d9e2
Component: engine
2015-08-28 08:27:36 -07:00
David Calavera
ed84a12688
Fix server header parsing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 243f98ff6de7aa16319be25c57ef1d910dfb6770
Component: engine
2015-08-28 11:06:24 -04:00
Kristina Zabunova
51511f9e16
unit test refactor in pkg/httputils as suggested by vdemeester; using pattern if x := …; x == nil {}
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit c3f1b2a5bd4a4330bcbad401c316af90925b99ad)
Upstream-commit: f753f6d597efb218d4b5786b9a4f09b6e73b48bc
Component: engine
2015-08-28 10:41:19 -04:00
Kristina Zabunova
208ac7a049
Increased test coverage of httputils to 70 %
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit d71817464e859cd323d6cdaf4dec5a9dd530f57e)
Upstream-commit: b3f999e86331b3c19572a88b5e123ea961ac54fb
Component: engine
2015-08-28 10:41:19 -04:00
Sven Dowideit
d04df77c91
Exploring the code using unit tests - these 2 functions do not work consistently
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: e48a22282897c4755552fd79bf0d7af220116dc9
Component: engine
2015-08-28 10:29:52 +00:00
Morgan Bauer
1870e3919c
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: abd72d4008dde7ee8249170d49eb4bc963c51e24
Component: engine
2015-08-27 22:07:42 -07:00
John Howard
2a282eed74
Windows: Revendor HCSShim with godoc
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
Upstream-commit: 5a5f9e93e9134378ffb5d0294577875a0d8c1937
Component: engine
2015-08-27 15:46:00 -07:00
Lynda O'Leary
ba189ea698
Style updates to find an issue page
...
* Fixed exp/beginner label colour background
* Added thead element to label table
* Updated issue list screenshot (old one referenced old whitebelt label)
* Content tweaks as per style guide
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
Upstream-commit: 6f22cc9b5c65b57bc9ca5a9dc56f30034b870510
Component: engine
2015-08-27 23:05:00 +01:00
Sebastiaan van Stijn
56ea150002
Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container
...
Added note about process interaction with container in detached mode
Upstream-commit: fdc73cc3fc3166c2c78d70653c117f1573d47096
Component: engine
2015-08-27 22:39:20 +02:00
Aaron Lehmann
49179849ea
Remove "...already being pulled" messages
...
These don't get seen, so they are unnecessary.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 9b9d70ad271b46a67bde57b8a807121f6e85b75f
Component: engine
2015-08-27 13:22:08 -07:00
Aaron Lehmann
d4bbf5d640
Clean up ProgressStatus
...
- Rename to Broadcaster
- Document exported types
- Change Wait function to just wait. Writing a message to the writer and
adding the writer to the observers list are now handled by separate
function calls.
- Avoid importing logrus (the condition where it was used should never
happen, anyway).
- Make writes non-blocking
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 26c9b585042ac7dce8db83478a69fd01a4b003d7
Component: engine
2015-08-27 13:22:08 -07:00
Brian Goff
9802667a69
Merge pull request #15882 from vdemeester/14756-lint-opts-trust
...
Carry #14813 on linting package opts and trust
Upstream-commit: ba019dc0d0a89b3152fc3791495af2ddf18e173d
Component: engine
2015-08-27 15:58:13 -04:00
Alexander Morozov
550ff739f5
Merge pull request #15893 from tonistiigi/fix-testsuite
...
Use DockerSuite for PullClientDisconnect test
Upstream-commit: 0ca2c3abf5030d92f45859aff6a66df54db092d2
Component: engine
2015-08-27 12:30:44 -07:00
Tonis Tiigi
190c9ba004
Use DockerSuite for PullClientDisconnect test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 9dd6c8822ddccff1952dfd611263ba551693ff7d
Component: engine
2015-08-27 11:22:54 -07:00
Aaron Lehmann
4366d3278e
Change poolAdd to return a boolean instead of an error
...
Previously, its other return value was used even when it returned an
error. This is awkward and goes against the convention. It also could
have resulted in a nil pointer dereference when an error was returned
because of an unknown pool type. This changes the unknown pool type
error to a panic (since the pool types are hardcoded at call sites and
must always be "push" or "pull"), and returns a "found" boolean instead
of an error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 80513d85cfc0e46f8202fc3030f11052bbfeea7a
Component: engine
2015-08-27 11:18:42 -07:00
Sam Abed
2b816e64e2
Show pull progress in terminal for inflight pull requests
...
Based on #12874 from Sam Abed <sam.abed@gmail.com >. His original commit
was brought up to date by manually porting the changes in pull.go into
the new code in pull_v1.go and pull_v2.go.
Fixes #8385
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 572f008e892b06262963ccb75c631f2f5d6c6fcd
Component: engine
2015-08-27 11:18:40 -07:00
moxiegirl
b3c7b9f038
Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images
...
Update filtering chapters on ps/images references
Upstream-commit: 04b0fb631441b9dda4e9cb1a38b255bac65aa4e7
Component: engine
2015-08-27 10:39:20 -07:00
David Calavera
bab25931f6
Merge pull request #15646 from tonistiigi/15589-pull-cancellation
...
Fix pull on client disconnect
Upstream-commit: 0634c653d5214c7d8e5f1a154ce35d40ac8d25d7
Component: engine
2015-08-27 17:54:08 +02:00
Vincent Demeester
a8d6119113
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 0bd016b1c31f807169019d10a496144c34698431
Component: engine
2015-08-27 17:36:11 +02:00
Brian Goff
062cf19d08
Fix docker volume invalid so it displays usage
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 38da43184d9353d1924ff8cd5bcedcf82ca6b008
Component: engine
2015-08-27 09:46:05 -04:00
Sevki Hasirci
cd1363a47b
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 5572148477ad069989bc3301e662cd6ee44832d2
Component: engine
2015-08-27 11:40:27 +02:00
Sevki Hasirci
c9cbc27779
Opts lint issues, ip and ulimit
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
Upstream-commit: 6eb03c53db1f9e99a8fe7b006f4ab3214c022c01
Component: engine
2015-08-27 11:40:27 +02:00
Tom Barlow
3fac2ae98a
Updated to use correct cgroup paths
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
Upstream-commit: b582977bc8a7937a12b9064aa7fbe688b7d9c8fe
Component: engine
2015-08-27 10:39:37 +01:00
David Calavera
cdd3b53574
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
Upstream-commit: 4579d5ac783df9d275fb616009cb6754efffe5ec
Component: engine
2015-08-27 10:02:25 +02:00
Vincent Demeester
59e5fcdd6a
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 61de442c49a56f9fc6f82174c97e1229e8aa39f2
Component: engine
2015-08-27 08:47:03 +02:00
Dharmit Shah
2133f70561
Added note about process interaction with container in detached mode
...
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Upstream-commit: 9f8891a855c81d49bced308b9bc90640af0c5f01
Component: engine
2015-08-27 09:39:34 +05:30
Sebastiaan van Stijn
54ef7aa45d
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
Upstream-commit: 44ea7e91fb1fc3e237ff6c70c2615f8cd919b8ff
Component: engine
2015-08-27 01:21:12 +02:00
Mike Brown
4801e8999f
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
Upstream-commit: 5caccd27cd9903786898a336bd28fc50450f9eab
Component: engine
2015-08-26 16:49:31 -05:00
moxiegirl
0143ca9eed
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
Upstream-commit: 5e8038d0b0e4f1af43a0daecc4775375721d1051
Component: engine
2015-08-26 14:19:44 -07:00
Alexander Morozov
248e0595b9
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
Upstream-commit: 459c2c66c3c168364f90532811c96c80e8153822
Component: engine
2015-08-26 14:00:53 -07:00
Vincent Demeester
e191a06015
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c1af0ac0820d1385fe2ee65593b0558840395c7b
Component: engine
2015-08-26 22:59:48 +02:00
Alexander Morozov
c09d503a17
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
Upstream-commit: 7a74422724ef3a4ae33f6bcd45ce908be279e476
Component: engine
2015-08-26 13:59:38 -07:00
Alexander Morozov
4602da3b1b
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
Upstream-commit: 70a814c3f378a5873aedf3be85397272de4f6672
Component: engine
2015-08-26 13:59:01 -07:00
moxiegirl
2dc587d949
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
Upstream-commit: ea65c38ac0972709cdb371ce6b1886eb252a126e
Component: engine
2015-08-26 13:51:06 -07:00
Morgan Bauer
ebcab8fd5d
reweight api doc for v1.21 to correct the order.
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 31a52a31c661fedc671e53c3706bc294f8bf6b1c
Component: engine
2015-08-26 13:40:37 -07:00
Alexander Morozov
20b02657f2
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
Upstream-commit: 47cdae243a7e0108d487e88cab966ff09e8d94c0
Component: engine
2015-08-26 13:29:24 -07:00
Sebastiaan van Stijn
05f2bb7d8b
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
Upstream-commit: fa13f7cde81d1d92c17740efb05823e7f9cc5468
Component: engine
2015-08-26 21:57:12 +02:00