Commit Graph

1105 Commits

Author SHA1 Message Date
d6a743bd91 Merge pull request #12044 from reteptilian/11721-remove-randomstring-3
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
Upstream-commit: b5c3d01e6b5d06ba3e477a71acf92ec564b279e6
Component: engine
2015-04-13 13:47:50 -07:00
c70c4ed8f3 Merge pull request #12204 from yestin/11601-supplement-tests-part-1
Improve test accuracy for pkg/chrootarchive (part 1)
Upstream-commit: b6e64981e655d1c0cdd3778d4d9fad0caca6e08a
Component: engine
2015-04-13 16:14:18 -04:00
31603a5780 Merge pull request #12342 from LK4D4/fix_vet_warn
Fix vet warning
Upstream-commit: afd973c4971ee2bed4c943cf08d6e7ef19dd8501
Component: engine
2015-04-13 12:56:47 -07:00
6d9355e11c Merge pull request #12276 from estesp/10246-really-fix-arg-list
Send archive options via pipe in chrootarchive
Upstream-commit: 9e0a55b48c019d0ca61e3f74d3b41f621f16ab48
Component: engine
2015-04-13 14:44:47 -04:00
710e6abbd8 Fix vet warning
pkg/archive/archive_test.go:496: arg changes for printf verb %s of wrong type: []archive.Change

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 213eab995a3e6dcdb69b587301cc5008911e3dfe
Component: engine
2015-04-13 11:43:30 -07:00
e7ca25cd17 Merge pull request #12297 from vdemeester/11603-pkg-archive-test-coverage
Add test on archive.go (#11603)
Upstream-commit: 5a174e5def446e2ea299aed3ebd41f8b949534ad
Component: engine
2015-04-13 10:54:21 -07:00
34cad7f622 correct pkg/stdcopy NewStdWriter function comments
pkg/stdcopy NewStdWriter function has wrong doc comment,
utils is not correct, it should be stdcopy

Signed-off-by: Deshi Xiao <xiaods@gmail.com>
Upstream-commit: a715b0e31beabed9ac5702af2ede619b4232cbdb
Component: engine
2015-04-13 17:21:27 +08:00
99fe2c5b3a Send archive options via pipe in chrootarchive
After finding our initial thinking on env. space versus arg list space
was wrong, we need to solve this by using a pipe between the caller and
child to marshall the (potentially very large) options array to the
archiver.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 908db51804635ce002e97e4efb867f7352204f8e
Component: engine
2015-04-12 21:16:54 -04:00
2f631c4832 Add test on archive.go (#11603)
- Trying to add or complete unit test to each ``func``
- Removing dead code (``escapeName``)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: c4fe5dad1deb45ecde460d7627523dbf032dc205
Component: engine
2015-04-11 23:21:37 +02:00
6607181ac9 Turned off Ctrl+C processing by Windows shell
Signed-off-by: Brendan Dixon <brendand@microsoft.com>
Upstream-commit: c337bfd2e0b0293dbca478a13c29a469493782eb
Component: engine
2015-04-10 15:43:35 -07:00
5f1006335a Merge pull request #12238 from brendandixon/win-cli/fixes
Corrected int16 overflow and buffer sizes
Upstream-commit: 43aca9adac732f32bb04cc435a1bb58521fd9984
Component: engine
2015-04-10 13:36:23 -04:00
d243477d0e Remove pools_nopool.go & build tag from pools.go
Fix #11576

Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com>
Upstream-commit: f01d755cd0af7b17596cc084871f7f032995cac3
Component: engine
2015-04-10 02:32:55 +03:00
aff5e53ec8 Corrected int16 overflow and buffer sizes
Signed-off-by: Brendan Dixon <brendand@microsoft.com>
Upstream-commit: a264e1e83debfaefcb99f5554b8eda9c088a09d1
Component: engine
2015-04-09 09:03:04 -07:00
2be71420a6 namesgenerator: Proposing Kilby/Noyce
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 197ec4a6377373b4a0c2eaf90c9fde9cede2074b
Component: engine
2015-04-09 04:11:06 -07:00
866fb761f9 Improve test accuracy for pkg/chrootarchive (part 1)
Check test correctness of untar by comparing destination with
source. For part one, it only compares the directories.

This is a supplement to the #11601 fix.

Signed-off-by: Yestin Sun <yestin.sun@polyera.com>
Upstream-commit: 7bb4b055abab5f5b561a970f7235c2d113a4d85f
Component: engine
2015-04-08 14:07:31 -07:00
7eb558ca75 Proposing Seymour Cray
Signed-off-by: Chris Stivers <chris@stivers.us>
Upstream-commit: 5206f76f44f3a55e52d3c0878b0ec780484595c0
Component: engine
2015-04-08 13:17:22 -07:00
ca7b99332a Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon
Refactor utils/utils_daemon
Upstream-commit: ebd7df3bbeb9486d13119178810a1ddabfd6d04d
Component: engine
2015-04-07 13:24:24 -07:00
37758aba7d Merge pull request #12033 from rhvgoyal/devmapper-cleanup
Devmapper Graph Driver Misc cleanup
Upstream-commit: 86d66d62737aa090b4a703ce0bfe3df0f9669a6b
Component: engine
2015-04-07 15:49:32 -04:00
02aa86f034 Swap width/height in GetWinsize and monitorTtySize
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 6e44246fed43341938a41c6db9b115e1e64d332a
Component: engine
2015-04-06 14:31:42 -07:00
bdfc59cfb7 Windows console fixes
Corrected integer size passed to Windows
Corrected DisableEcho / SetRawTerminal to not modify state
Cleaned up and made routines more idiomatic
Corrected raw mode state bits
Removed duplicate IsTerminal
Corrected off-by-one error
Minor idiomatic change

Signed-off-by: Brendan Dixon <brendand@microsoft.com>
Upstream-commit: 1a36a113d4afc11151c80b111d7357b7c31be32b
Component: engine
2015-04-03 15:02:52 -07:00
d1ddfb9a9a Merge pull request #11886 from jamiehannaford/pkg-mnt-docs
Document exported functions and consts in pkg/mount
Upstream-commit: 9cdad8a26b4af14680c4bcb25feea854536a323b
Component: engine
2015-04-03 21:28:11 +00:00
31f1448b86 Refactor ultis/utils_daemon, fixes #11908
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 01724c1cf11ce4a9e3b1978c7c07fd25656ed137
Component: engine
2015-04-03 20:20:04 +02:00
5361796b1a Add documentation for exported functions and types
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com>
Upstream-commit: 9a98556c2bc355170893568ca20e102cbda7d600
Component: engine
2015-04-03 11:33:34 +02:00
3b7f375359 Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
Signed-off-by: Joey Gibson <joey@joeygibson.com>
Upstream-commit: a9443de7c5759398804acaa3fd9ccfb196557cfe
Component: engine
2015-04-03 00:18:21 -04:00
5b01c8abc0 devmapper: Use a pointer as argument to deferred function UdevWait()
UdevWait() is deferred and takes uint cookie as an argument. As arguments
to deferred functions are calculated at the time of call, it is possible
that any update to cookie later by libdm are not taken into account when
UdevWait() is called. Hence use a pointer to uint as argument to UdevWait()
function.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 665656afbb8932a11c69c0cd79e21a768aa46d38
Component: engine
2015-04-02 16:47:14 -04:00
cb8a2764e5 devicemapper: Remove debug messages from RemoveDevice()
devmapper graph driver retries device removal 1000 times in case of failure
and if this fills up console with 1000 messages (when daemon is running in
debug mode). So remove these debug messages.
 
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: cb7c893275c32ddfa775c3f22869a9c211024c71
Component: engine
2015-04-02 16:47:14 -04:00
64b84b5716 Fixes #11721 removed GenerateRandomString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>

gofmt

Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 6896016b7c7a95ac33c77a222c359cf35a471eb9
Component: engine
2015-04-02 08:07:52 -07:00
aa32736c19 Added unit tests for stringutils GenerateRandomAlphaOnlyString and GenerateRandomAsciiString
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com>
Upstream-commit: 11287f77144954fe82f75ade671da739559c664f
Component: engine
2015-04-02 07:12:47 -07:00
8391dba9e0 Merge pull request #11099 from iavael/bugfix/tar-symlinks
Fixed handling hardlinks to symlinks in tar stream
Upstream-commit: 88b8fc10e3dc5613859da31900e0a1b0bbb303c6
Component: engine
2015-04-01 18:34:00 -04:00
4b9b1a6d15 pkg/broadcastwriter: reset after 4 KB w/o stream
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 153f98bad51e2f46cf3853d2da0173bcfb4b687d
Component: engine
2015-04-01 01:26:19 +03:00
bce31440c3 Skip heavy operations if there is no jsonlog writers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d15d1674c318366e881fa4ea2977192750d3471b
Component: engine
2015-04-01 01:02:18 +03:00
e1d3084c1a pkg/broadcastwriter: use []byte to lower alloc
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 5550a46946a2e6e1be8844d78a78122b333fae26
Component: engine
2015-04-01 01:02:18 +03:00
a17bdc8390 pkg/jsonlog: add JSONLogBytes for low allocations
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b535ed3595036931e8e6f4e9da7cd2beb67cb19e
Component: engine
2015-04-01 01:02:18 +03:00
25208704c6 pkg/broadcastwriter: add test w/ "" stream only
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: f26f405b00a2d9d1c6ebc11bffb810c54ac510ce
Component: engine
2015-04-01 01:02:18 +03:00
a5206cf154 Merge pull request #11952 from ankushagarwal/#11581
Add some documentation to pkg/system
Upstream-commit: 7dd79dcc7b0c1e0a577de0e232fd936086e9a2cd
Component: engine
2015-03-31 14:58:32 -07:00
3b5106362e Fix progress reader output on close
Currently the progress reader won't close properly by not setting the close size.

fixes #11849

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: aa3083f577224ad74384f648b17c1474ab47b44f
Component: engine
2015-03-31 13:17:25 -07:00
4d65e8c72c Add some documentation to pkg/system
Partially addresses #11581

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: e94a48ffc8fa287c4b1b441c5308999693c58b75
Component: engine
2015-03-31 12:00:33 -07:00
127f29ac8e fix basicAuth function not in go1.3.3
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 4a2ef6c8053d5b0eb768297af8609505198c7187
Component: engine
2015-03-30 15:28:34 -07:00
f6752519af Merge pull request #11893 from runcom/11892-refactor-utils-flags
Refactor utils/flags.go
Upstream-commit: 00a15227f8c7679a4a5c1f90e61367a3d1be92df
Component: engine
2015-03-30 13:35:40 -07:00
f3f4c403c1 Merge pull request #11900 from runcom/11899-refactor-utils-http
Refactor utils/http.go
Upstream-commit: 70a479dda5e2f99ac141853c2a8527a026c1da6f
Component: engine
2015-03-30 13:11:45 -07:00
a62098f98e Refactor utils/http.go, fixes #11899
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 0995ab5946b068a14cba05be8b2693c4181097e3
Component: engine
2015-03-30 17:59:57 +02:00
78bf03cec8 pkg/broadcastwriter: avoid alloc w/ WriteString
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: db877d8a425a3c063eedb1908ab1b50df1a33a57
Component: engine
2015-03-29 15:20:53 +03:00
0f80e9e5da Refactor utils/flags.go, fixes #11892
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 5670c6c6954e08575a6c821137a7ea6d9084af93
Component: engine
2015-03-29 03:22:46 +02:00
cbbbdaca2d Merge pull request #11853 from EricR/doc-PkgSysInfo
Add some basic doc for SysInfo
Upstream-commit: 7cc73607a274c8795a88bf711a8d8d2cdd154bab
Component: engine
2015-03-27 14:52:20 -07:00
35d3543e9d Merge pull request #11871 from NinjaTrappeur/dry-run-test
Fix vet warning in devicemapper.
Upstream-commit: cc609c75560f39bfa2a34d2ea0e4be292d851954
Component: engine
2015-03-27 14:48:55 -07:00
7ec8e95afe Fix vet warning in devicemapper.
Issue #11828

Signed-off-by: Félix Baylac-Jacqué <baylac.felix@gmail.com>
Upstream-commit: 6b764bba8ad1c1006dadf24ec55edb9de200c706
Component: engine
2015-03-27 20:16:25 +01:00
e9805495bf Update inline doc for New
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 3716df57c097803dec220ff95fffdae8394145fc
Component: engine
2015-03-27 13:55:22 -04:00
1c9316a817 Merge pull request #11788 from reikani/pchoi
Changed snake case naming to camelCase.
Upstream-commit: da5c863d20df8c030b3ffc6c4e95f976ed162721
Component: engine
2015-03-26 23:55:50 -07:00
cce1904e9d Add missing . in comment
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 6abe160eaec49c693b69d14304fe39d78ea4abb4
Component: engine
2015-03-26 23:22:05 -04:00
b0def5e5a0 Add some basic doc for SysInfo
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com>
Upstream-commit: 01bbc3fbb9c3ab3dec0f271710739465b0f80b7a
Component: engine
2015-03-26 23:05:07 -04:00