Commit Graph
2048 Commits
Author SHA1 Message Date
Michael Crosby 22832ff041 Graphtest is ok to compile normally
The graphtest package is only imported in the test files of other
packages therefore we do not leak testing flags.

Signed-off-by: Michael Crosby <michael@docker.com>
Upstream-commit: b386bce1f1bc92584282cc3f6656878c05d75272
Component: engine
2014-08-07 14:33:09 -07:00
Peter Bourgon b75c55fd72 Only import "testing" from *_test.go
This prevents the testing package flags from leaking into the flagsets
of binaries that import docker. I left integration-cli alone.

Docker-DCO-1.1-Signed-off-by: Peter Bourgon <peter@bourgon.org> (github: peterbourgon)
Upstream-commit: b87daf6d697655ca092bf54717a64b07504a13c1
Component: engine
2014-08-07 14:25:21 -07:00
Erik Hollensbe 325695b856 utils.Debugf -> log.Printf, move jsonlog to own package.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5cdb9c8acab75df74d20cd937e4091dacb355160
Component: engine
2014-08-06 16:39:01 -07:00
Erik Hollensbe 00eca7c915 utils/broadcastwriter -> pkg/broadcastwriter
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5ab09f2f7129225220fc9c0b76b2e2aec6823ee1
Component: engine
2014-08-06 16:37:01 -07:00
Tianon Gravi 416ed08d2b Replace "amd64" build tags with "cgo" as appropriate, and remove where unnecessary
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 89ec17d11319ae39bff19985ac59fc878fe1fe1e
Component: engine
2014-08-06 17:20:21 -06:00
Tianon Gravi 5c55cb7669 Purge the bits of pkg/system that moved to libcontainer/system
Signed-off-by: Andrew Page <admwiggin@gmail.com>
Upstream-commit: 60341f80d7b7918d1c1eff7c38cbc55c9bdec4d9
Component: engine
2014-08-02 01:35:04 -06:00
Michael Crosby 85222943a2 Merge pull request #7312 from tianon/update-libcontainer
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
2014-07-31 15:20:07 -07:00
Tibor Vass be277e6761 Merge pull request #7324 from erikh/move_tarsum
Move tarsum to pkg/
Upstream-commit: 531f5907d64ff56b0beea1de11d65885e29ee5ad
Component: engine
2014-07-31 16:56:24 -04:00
Tianon Gravi 0a4008fdb8 Remove pkg/user now that it's embedded in libcontainer
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f34d0e55f3a1f15abf28680d84ab48d40ffafbc1
Component: engine
2014-07-31 12:46:39 -06:00
Erik Hollensbe 11a2f7d8c4 utils.Debugf -> fmt.Printf
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ff02bea88302dcd21345f7e4258400b58b9c142b
Component: engine
2014-07-30 08:42:53 -07:00
Tibor Vass ca4826fd77 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
2014-07-30 10:37:52 -04:00
Erik Hollensbe 3d1163e7b4 move testdata to tarsum package.
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4184cccb0f291b329292da1a31108407cb1a4750
Component: engine
2014-07-30 06:52:24 -07:00
Erik Hollensbe 5a8e5fe7dc utils/tarsum* -> pkg/tarsum
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 1219e458d105461fd7de23fa4b04a1233f61f8a4
Component: engine
2014-07-30 06:42:12 -07:00
Erik Hollensbe e25f77248d Move parsing functions to pkg/parsers and the specific kernel handling
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
2014-07-29 13:09:10 -07:00
Victor Vieux b812e976e3 Merge pull request #7272 from unclejack/create_httputils_pkg
move resumablerequestreader to pkg/httputils
Upstream-commit: 3bae02cbe32b856107a5d61c496f35d69c35aa2d
Component: engine
2014-07-29 12:18:10 -07:00
unclejack b7f9603931 move resumablerequestreader to pkg
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c0517857f64d1148d02809e3ba3dd39bf8322ed3
Component: engine
2014-07-29 16:30:45 +03:00
Victor Vieux 2a6df8d538 Merge pull request #7210 from fcarriedo/refactor-common-code
pkg/units: Refactor common code
Upstream-commit: f906f31877f63a7f9fab954157667e0f341210ba
Component: engine
2014-07-28 11:45:46 -07:00
Francisco Carriedo f378b5d004 pkg/units: Updated tests with unit constants
Also, now that I was at it, gave them a small refactor.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 81c7d28b842844778a652b7353f52332f4276afb
Component: engine
2014-07-26 20:00:18 -07:00
Francisco Carriedo 3b6e93d717 pkg/units: Unit constants directly int64
int64 seems sufficient

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: c7a2e86b5186acb58999d7b2b3a85a9bb4421b1f
Component: engine
2014-07-26 20:00:08 -07:00
fcarriedo 81918c582c pkg/units: including suggestions and enhancements
Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 2fb63aba0bf991873d56888f244d6aeee0c5fc57
Component: engine
2014-07-25 09:33:04 -07:00
Victor Vieux 6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
fcarriedo f664c76057 pkg/units: Updated Compile() to MustCompile()
We were doing exactly what `regexp.MustCompile()` already does.

Docker-DCO-1.1-Signed-off-by: fcarriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: c765134ac954f54f8b6aca6df25cf5e28911b563
Component: engine
2014-07-24 13:19:20 -07:00
Francisco Carriedo 22e53a9bae pkg/units: Refactored common code to single func
Both functions perform the same logic and they just vary on the base
multiplication units. We can refactor the common code into a single
place.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 386d300a6e07c99380a0814497cf0bc672df1e63
Component: engine
2014-07-24 00:03:59 -07:00
Francisco Carriedo 088f734e5e pkg/units: Moved 'units' out of function
No need to initialize every time the function executes since it works as
a catalog.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: e4ab996b9d0d97089b076cfef32405f5f3fedc7c
Component: engine
2014-07-24 00:03:59 -07:00
Francisco Carriedo 23fcdf4f5e pkg/units: Compacted var declaration and initialization
No need to have two lines. The type is even explicit when type casting
to `float64(size)`

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: d512294382c9013dee2820745db02ab63dc2ecdd
Component: engine
2014-07-24 00:03:40 -07:00
Francisco Carriedo 9cee4d41c4 pkg/units: Refactor regexp.Compile to init()
No need to recompile a fixed regular expression each time the function
executes. Abstracting it to the `init()` method.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: a4d57d8a851bf288804215b39c9d56a51550a228
Component: engine
2014-07-23 23:45:03 -07:00
Francisco Carriedo fc192c453a pkg/units: Standardized supported sizes
May make sense that both `FromHumanSize()` and `RAMInBytes()` support
the same units. Added 'PB' to the RAMInBytes regex.

Also updated tests.

Note: int64 is overflowed on quantities >= EB

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 0fd37bd7ac0f92eda0a55cf2bedf77f1996b8472
Component: engine
2014-07-23 23:37:06 -07:00
Francisco Carriedo 1e857dc998 pkg/units: Using 'case' instead of trickled ifs
Seems the perfect case for 'case' ;).

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 03697f0a93b04122a5039db915afddf60ccec448
Component: engine
2014-07-23 20:38:36 -07:00
Michael Crosby b62c8f48b7 Merge pull request #7164 from fcarriedo/not-error-as-var-name
pkg/units: Better to not use `error` as var name
Upstream-commit: 604a975303230cec2684bfede67cedbd9bc50d4d
Component: engine
2014-07-23 11:04:03 -07:00
Michael Crosby b782732841 Merge pull request #7167 from unclejack/maintainer_truncindex
pkg/truncindex: add unclejack to MAINTAINERS
Upstream-commit: 885cda1ae252b2ca6d256410cc0bb8c0dc7e8823
Component: engine
2014-07-22 17:10:38 -07:00
Francisco Carriedo 204cff966e pkg/units: Better to not use error as var name
Better to not use `error` as var name (might eclipse the error type) for
clarity and to prevent subtle bugs.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: ea7b8ea03f5c2222060afe435e907c1ab855a44b
Component: engine
2014-07-22 15:39:59 -07:00
unclejack 24cf66b391 pkg/truncindex: add unclejack to MAINTAINERS
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 7407664c6621782101f73162b7f0ad76a53fa46b
Component: engine
2014-07-22 23:08:28 +03:00
Francisco Carriedo 10f00b2b3a pkg/units: Remove unused named returns
Remove named returns since not used in function body.  Might prevent
potential subtle bugs.

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: 588090c49bf2ec077626d89196515e6bef1f7a69
Component: engine
2014-07-22 12:16:50 -07:00
Francisco Carriedo 64c32c0b31 pkg/units: Increased test coverage. Closes #7159.
Increased coverage:

  * Added test cases to size_test.go
  * Added coverage for duration.go

Docker-DCO-1.1-Signed-off-by: Francisco Carriedo <fcarriedo@gmail.com> (github: fcarriedo)
Upstream-commit: c47ab1425f0cf08168af7e5561e39ff2e39625e0
Component: engine
2014-07-22 09:56:58 -07:00
Michael Crosby fabec654d7 Merge pull request #7061 from muchweb/rms
Can't believe you forgot RMS
Upstream-commit: 86f20e561f1030e5177f3919394b7b8b7f88a410
Component: engine
2014-07-21 12:02:45 -07:00
Michael Crosby 81d8d08389 Don't create pty slave in the daemon for native driver
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 1501c342d815e3a128dac393b69e23f6ec39c2d7
Component: engine
2014-07-16 16:57:19 -07:00
s-ko 9b124873a6 Removed :neckbeard: RMS test case
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net> (github: muchweb)
Upstream-commit: b0e9d370c28ebe6d783f0008c3c0d513c8c030e8
Component: engine
2014-07-16 23:22:21 +01:00
s-ko 03e13dfc55 Added :neckbeard: RMS the founder of 🐃 GNU and 🆓 as in :free:dom software
Docker-DCO-1.1-Signed-off-by: Aleksandrs Fadins <aleks@s-ko.net> (github: muchweb)
Upstream-commit: 352909dd54e864186d6050f4601d2fb78d889810
Component: engine
2014-07-16 22:45:08 +01:00
Victor Vieux 75cb3255af Merge pull request #6720 from fabiofalci/relax_dns_search
Relax dns search to accept empty domain
Upstream-commit: 170609e36957fc044723789bc66918bd7d189702
Component: engine
2014-07-07 15:12:29 -07:00
unclejack efbfc9bcff Merge pull request #6645 from snitm/dmthinp-devel
Dmthinp devel
Upstream-commit: 2e4f99d99c34edaba2d37270545af2b8fd753dab
Component: engine
2014-07-07 21:20:31 +03:00
Fabio Falci 525592aa62 Relax dns search to accept empty domain
In that case /etc/resolv.conf will be generated with no search
option. Usage: --dns-search=.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 804b00cd7d1f084a872211e5043d255c454c8e51
Component: engine
2014-07-04 09:33:53 +01:00
Tibor Vass 684f8af215 Merge pull request #6748 from LK4D4/increase_max_patricia_prefix
Increase max patricia prefix
Upstream-commit: b0824edc7c93db4c2e880931a4041ca1188a2edd
Component: engine
2014-07-01 19:03:30 -04:00
Alexandr Morozov c1f6739a06 Implement tail for docker logs
Fixes #4330
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 1dc0caf9c0170ab8e7f5a2f77f2dbdacff322eff
Component: engine
2014-07-01 23:44:12 +04:00
LK4D4 4a9952978a Increase patricia.MaxPrefixPerNode
It allows to avoid redundant prefix splits
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com> (github: LK4D4)
Upstream-commit: 095cb7a81800512b99474aec7245bddddd1b2278
Component: engine
2014-06-28 12:27:44 +04:00
Jonathan Boulle f94025a466 sort flags with the same name in a consistent order
Docker-DCO-1.1-Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com> (github: jonboulle)
Upstream-commit: d14cfc8d435dbef0d70b6444b275a025e60ac171
Component: engine
2014-06-27 01:46:59 +00:00
Michael Crosby 0256ecf832 Merge pull request #6657 from unclejack/refactor_truncindex
refactor TruncIndex to use a trie & vendor deps
Upstream-commit: cab7894808d5b43590ec230c2391108536c34108
Component: engine
2014-06-26 16:53:49 -07:00
Solomon Hykes 92fe778319 Merge pull request #6625 from vieux/remove_dockerscript
remove dockerscript
Upstream-commit: 69ec5824c3aec1dafb95264577807eac5afd9865
Component: engine
2014-06-26 14:56:22 -07:00
unclejack 55be9bc370 refactor TruncIndex to use a trie & vendor deps
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e0dad305791a7406cf819a27fa5a079a46a62acc
Component: engine
2014-06-26 16:57:54 +03:00
Solomon Hykes 9a4ed6541e Merge pull request #6218 from vieux/update_maintainers
Upstream-commit: c9e647e42f3019b619b0ef47ff944831c226624c
Component: engine
2014-06-25 17:00:32 -07:00
Michael Crosby 2437455209 Merge pull request #6646 from tiborvass/fix-workdir
Fix --workdir=/
Upstream-commit: d91b8bcf0b21f7abf23b06872ad960ebd25e733a
Component: engine
2014-06-25 15:19:51 -07:00