b69e823a30
Merge pull request #35056 from tklauser/win-console-mode-consts
...
Use windows console mode constants from Azure/go-ansiterm
Upstream-commit: 1c4fad8135b52a8a6405aef897712c4ca7a6d168
Component: engine
2017-10-05 00:41:22 +02:00
d35ee25d03
pkg/locker: add benchmarks
...
Signed-off-by: Alexander Morozov <lk4d4math@gmail.com >
Upstream-commit: 889cfd1b441e8039bb6b78e8c54276b8eb03cdef
Component: engine
2017-10-02 11:20:21 -07:00
46c885c3e3
Use all console mode constants from go-ansiterm
...
The missing console mode constants were added to go-ansiterm in
Azure/go-ansiterm#23 . Use these constants instead of defining them
locally.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 9335683fa50c4863ada4bf00a30e7dfbfef3c783
Component: engine
2017-10-02 09:49:20 +02:00
48757849a4
Merge pull request #34946 from dnephin/fix-jsonlog
...
Move pkg/jsonlog to be a subpackage of the single consumer
Upstream-commit: 7d47823c22945bb24a609a7ef20c0559d78d96e4
Component: engine
2017-09-26 10:49:57 +02:00
f367f50630
Move jsonlog to a subpackage of jsonfilelog
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 035604cca6d6bd9a432268caf7515a35023908ed
Component: engine
2017-09-25 16:07:25 -04:00
7d644fb209
Fix benchmarks and remove more unnecessary code.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a06ad2792ab92d4f246e4b4cc4c3529eb060651e
Component: engine
2017-09-25 16:07:25 -04:00
4701b66889
Remove unused JSONLog marshaling
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 231c5cbd50e1870f31eb6a525b2df2ed7a716565
Component: engine
2017-09-25 16:07:25 -04:00
a001c9d5c7
Remove unused Format
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 638d4cc7e4390ab217be711913017b22ce2cd5c2
Component: engine
2017-09-25 16:07:25 -04:00
0c6f170345
Unexport FastTimeMarshalJSON
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 7de92de636ef307d66b7b20b24f166a47f40f72b
Component: engine
2017-09-25 16:07:25 -04:00
101f740d40
Move RFC3339NanoFixed to a more appropriate package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 27cfa68af16721c978803c3b695bcc7181ccc721
Component: engine
2017-09-25 16:07:24 -04:00
08619d0c7c
Fix TestMount under a selinux system
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8bebd42df2d8eaa0ecdc9c78bc1e395a752eb5c9
Component: engine
2017-09-25 11:54:30 +02:00
6700f361c5
pkg/package: remove promise package
...
The promise package represents a simple enough concurrency pattern that
replicating it in place is sufficient. To end the propagation of this
package, it has been removed and the uses have been inlined.
While this code could likely be refactored to be simpler without the
package, the changes have been minimized to reduce the possibility of
defects. Someone else may want to do further refactoring to remove
closures and reduce the number of goroutines in use.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: 0cd4ab3f9a3f242468484fc62b46e632fdba5e13
Component: engine
2017-09-21 17:56:45 -07:00
3a50fe644a
Merge pull request #34861 from tklauser/fix-cstring-leaks
...
Fix CString memory leaks
Upstream-commit: 777d4a1bf45c85db6931205d4adbe38a17c583d7
Component: engine
2017-09-21 09:14:07 -07:00
95004c9da9
Merge pull request #31993 from dccurtis/issue-31816
...
Fixing ‘docker cp’ to allow new target file name in a host symlinked directory
Upstream-commit: 149f3aceb277ecccd33ee815e9c54d6aec782ab5
Component: engine
2017-09-19 10:54:53 -07:00
e3dc487328
devmapper: show dmesg if mount fails
...
If mount fails, the reason might be right there in the kernel log ring buffer.
Let's include it in the error message, it might be of great help.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 46833ee1c353c247e3ef817a08d5a35a2a43bdf3
Component: engine
2017-09-17 22:04:31 -07:00
322ee8f812
devmapper gd: disable for static build
...
Static build with devmapper is impossible now since libudev is required
and no static version of libudev is available (as static libraries are
not supported by systemd which udev is part of).
This should not hurt anyone as "[t]he primary user of static builds
is the Editions, and docker in docker via the containers, and none
of those use device mapper".
Also, since the need for static libdevmapper is gone, there is no need
to self-compile libdevmapper -- let's use the one from Debian Stretch.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 84f1c054e66d3999aaf2751062cda8a77925b7ae
Component: engine
2017-09-17 22:04:31 -07:00
5086fdcfde
Fix CString memory leaks
...
Make sure to call C.free on C string allocated using C.CString in every
exit path.
C.CString allocates memory in the C heap using malloc. It is the callers
responsibility to free them. See
https://golang.org/cmd/cgo/#hdr-Go_references_to_C for details.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 593dbfd1448e8dac08488786fde6fe7fb057bdac
Component: engine
2017-09-15 09:57:26 +02:00
a641c1b7f0
Add LCOW behind experimental,
...
might not be the cleanest way, but it's definitly the way with the
minimum code change.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: ff686743c50dc34b57f5627ba6fee38502bdd3ec
Component: engine
2017-09-14 13:51:16 -07:00
cddfe04f6a
LCOW: Implemented support for docker cp + build
...
This enables docker cp and ADD/COPY docker build support for LCOW.
Originally, the graphdriver.Get() interface returned a local path
to the container root filesystem. This does not work for LCOW, so
the Get() method now returns an interface that LCOW implements to
support copying to and from the container.
Signed-off-by: Akash Gupta <akagup@microsoft.com >
Upstream-commit: 7a7357dae1bcccb17e9b2d4c7c8f5c025fce56ca
Component: engine
2017-09-14 12:07:52 -07:00
18c29c5c5f
Add gosimple linter
...
Update gometalinter
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f7f101d57ef8cbf2d8723a18b7d723c5c5dd04b6
Component: engine
2017-09-12 12:09:59 -04:00
e388be9473
Fix typos in Locker example
...
Signed-off-by: Marcel Edmund Franke <marcel.edmund.franke@gmail.com >
Upstream-commit: 6d3bc28289c265a65879a7f28264e6bacb95fbe1
Component: engine
2017-09-10 11:34:19 +02:00
fdd3e06a77
Add ineffassign linter
...
Also enable GC in linting to reduce memory usage.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 09652bf8789142a5a5a1de2d41590300761b4954
Component: engine
2017-09-08 18:23:21 -04:00
d7504f67d1
Merge pull request #34738 from wgliang/optimization1
...
Optimize some wrong usage and spelling
Upstream-commit: 2dcb77b24c80dd95b52358c92436f68f2a33eb01
Component: engine
2017-09-07 09:45:14 -07:00
eec1d4ef54
Optimize some wrong usage and spelling
...
Signed-off-by: wgliang <liangcszzu@163.com >
Upstream-commit: 94cefa21459a0c620e5a9c2da04df6d3a43dae17
Component: engine
2017-09-07 09:44:08 +08:00
5063459b89
Merge pull request #34748 from dnephin/cleanup-client-deps
...
Cleanup client/ package dependencies
Upstream-commit: be97c66708c24727836a22247319ff2943d91a03
Component: engine
2017-09-06 16:14:29 -07:00
9f20b18453
Move tlsconfig to client package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6916c215b00ab4d7edf4be14848ab2e695697381
Component: engine
2017-09-06 16:39:55 -04:00
0bd644faaf
re-enable some conversion for darwin-amd64 platform
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
Upstream-commit: 7c9e64a2e1891bf1020d9312a18741c734fa1cd6
Component: engine
2017-09-06 12:22:41 +02:00
7ded486a94
Merge pull request #34700 from tklauser/pkg-term-winsize
...
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
Upstream-commit: a127269803b9053713cd51d20f4ae00dae19b6d1
Component: engine
2017-09-01 15:58:25 -04:00
8ef302a435
Merge pull request #34625 from dnephin/more-linters
...
Add interfacer and unconvert linters
Upstream-commit: cb952bf00695b3429476f59c5534a9c604c6f010
Component: engine
2017-09-01 08:46:08 -07:00
2be7b6733b
pkg/term: use IoctlGetWinsize/IoctlSetWinsize from golang.org/x/sys/unix
...
Use unix.IoctlGetWinsize and unix.IoctlSetWinsize instead of manually
reimplementing them.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: 32dfc0cb64992aa5e208273658b6e404268c63f4
Component: engine
2017-09-01 14:43:09 +02:00
4a60bb27ab
Merge pull request #34615 from dnephin/remove-pkg-testutil-assert
...
Move ErrorContains to an internal package
Upstream-commit: 6ed5db6243243c8b7ee3ff165f21bda4465124e5
Component: engine
2017-08-26 19:09:27 -07:00
67a4f5a5d6
Merge pull request #34613 from dnephin/remove-pkg-testutil-cmd
...
Remove pkg testutil cmd
Upstream-commit: a5631c75e1349f6d71c53dbabee7f166f770d2b2
Component: engine
2017-08-25 15:09:52 -04:00
61202c02f5
Merge pull request #34590 from shouze/add-support-of-ChownOpts-to-TarWithOptions
...
archive: add ChownOpts support to TarWithOptions
Upstream-commit: 475c9926db9228e94b222eaf6e9fe30f0b02582a
Component: engine
2017-08-25 18:21:31 +02:00
687fe21a97
Remove pkg/testutil/cmd
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: c2c127fa5a23599d698a71ead103b2f676fdf5c4
Component: engine
2017-08-25 12:07:31 -04:00
9cb0439501
Move ErrorContains to an internal package.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e62b2d410cda6ac9166ac8d052fd3fb99a9460bf
Component: engine
2017-08-25 12:04:58 -04:00
8ae7aa2322
Merge pull request #34583 from tklauser/win-event-functions
...
Use windows event functions from golang.org/x/sys/windows
Upstream-commit: 2cea2f5469871c16564c900c5b27cee102ebff0b
Component: engine
2017-08-25 07:43:03 -07:00
01392057b0
Add unconvert linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 2f5f0af3fdb7e9ee607a0e178dbe2af6e10cccf4
Component: engine
2017-08-24 15:08:31 -04:00
aacb33bdaf
Remove pkg/testutil tempfile and golden
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 468154a841b599dd3a7acaf6162e2a73cf44d1f6
Component: engine
2017-08-23 17:26:27 -04:00
35a83e1585
archive: add ChownOpts support to TarWithOptions
...
Signed-off-by: Sébastien HOUZÉ <cto@verylastroom.com >
Upstream-commit: 8a34c67a7eca7b8193f1c02fb6641abd719dce01
Component: engine
2017-08-23 20:52:29 +02:00
f5c5b5cc38
Remove RunCommandPipelineWithOutput
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e885af2a6b6b9f88a8b419d225b1425ec3d9416e
Component: engine
2017-08-22 17:15:26 -04:00
e13afe9c59
Remove RandomTmpDirPath
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 9db68f4dea6379b7e85ee5c6f2be080a6fcbe4ca
Component: engine
2017-08-22 17:15:26 -04:00
3177188cce
Remove testutil.ParseCgroupPaths
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e8bd67181533222c192cca19a4279c85db48875e
Component: engine
2017-08-22 17:15:26 -04:00
931aa8f0e2
Remove ConsumeWithSpeed
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 1455086c4b922f09777aa49ec26a98c463be6a49
Component: engine
2017-08-22 17:15:26 -04:00
56e5cffbc1
Remove testutil.ReadBody
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 4f304e72a2e4451b043ab1a73a6c44894333c5c7
Component: engine
2017-08-22 17:15:26 -04:00
5e635809d5
Remove ChannelBuffer
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6a0105b452e604866320aad7e2ad291beb7925b9
Component: engine
2017-08-22 17:15:26 -04:00
594cd7054e
Remove ListTar
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6ffbe3f6a893a97f534d535538a646d4b79fed03
Component: engine
2017-08-22 17:15:26 -04:00
524d0fa645
Remove testutil.CompareDirectoryEntries and IsKilled
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6151d55ee7301d2b3800d701a9ce4969848e4d6b
Component: engine
2017-08-22 17:15:26 -04:00
b087533ab3
Remove testutil.ConvertSliceOfStringsToMap
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: d30e51495a7b748d0d5e73e1b8c7edf5c584c4ef
Component: engine
2017-08-22 17:15:26 -04:00
7daf459b1c
Remove unused helpers.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a0c9089971b6c3cdc9ac1233f3c5e27a0a723214
Component: engine
2017-08-22 17:15:26 -04:00
94c685a721
Add deadcode linter
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 62c1f0ef41e6cd88a8846da1c11976a320ca8b41
Component: engine
2017-08-21 18:18:50 -04:00
