be2aa448d0
Add gotestyourself to vendor
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 0a7ff351b76f369b1cb1bc741e54b0d9018e7410
Component: engine
2017-08-25 12:06:25 -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
9f8c4fc433
Merge pull request #34614 from dnephin/remove-pkg-testutil-tempfile
...
Remove pkg testutil tempfile
Upstream-commit: ff6fbe224f8b490b05f8489e5ae3219126d8017b
Component: engine
2017-08-24 15:24:15 -07:00
51ed00caab
Merge pull request #34627 from estesp/no-userns-plugin-upgrade-test
...
Turn off plugin upgrade test when userns on
Upstream-commit: 0f957d2c09af7216d839f267c14db86d9194b5d0
Component: engine
2017-08-24 15:04:44 -07:00
2ca5291236
Merge pull request #34356 from mlaventure/update-containerd
...
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
Upstream-commit: 285bc997311b75263bfac9e8ff7c4d60cdeca0bc
Component: engine
2017-08-24 14:25:44 -07:00
ffac489c66
Merge pull request #34626 from kolyshkin/ipcmode-samehost
...
docker_api_ipcmode_test: add SameHostDaemon req
Upstream-commit: acd2995143023805f890677eef05849211410c4d
Component: engine
2017-08-24 13:01:26 -07:00
4d6d2b530e
Turn off plugin upgrade test when userns on
...
Until volume plugins can be made aware of the remapped root,
interactions with volumes created by plugin will not work as the file
ownership denies permissions to the userns remapped range.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: b1ced2af03c5a8009c314bde80b5f2516e0522fd
Component: engine
2017-08-24 10:52:11 -07:00
c2a60a890d
Merge pull request #34451 from Microsoft/jjh/bootvhdx
...
LCOW: Additional flags for VHD boot
Upstream-commit: e5cdaf1bd9c5d7984e491cb346ae1453dbb79f50
Component: engine
2017-08-24 08:38:19 -07:00
80c42a7f96
Merge pull request #33534 from sbko/31410-replace-deprecated-sockrequest
...
Stop using deprecated SockRequest
Upstream-commit: eb52bb22a4f3b9632545f10c0a3af436aced817d
Component: engine
2017-08-24 11:30:13 -04:00
42d094ea01
docker_api_ipcmode_test: add SameHostDaemon req
...
This is needed for tests that do some checks and/or create files
on the host system. Inspired by commit d9f3548a9.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: 8a9878081f8e14a54067f249bc98ae66f0b61ba3
Component: engine
2017-08-24 17:02:21 +03:00
364ecfbfa8
Merge pull request #34611 from estesp/no-hostmode-userns
...
Host-mode IPC sharing not possible in a userns
Upstream-commit: ff167a285a79339eaeb1772c9ce7a22d33ad0136
Component: engine
2017-08-23 19:52:03 -07: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
b03ce80e95
Update tests to use gotestyourself/fs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 60672382c7eb1f65e063c4bf07b0880559cea91b
Component: engine
2017-08-23 17:25:00 -04:00
332ff8ee6f
Add gotestyourself to vendor.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 47962ee32ff785eb179de4a706e557b66e8b1841
Component: engine
2017-08-23 17:13:27 -04:00
e48013ec36
Stop using deprecated SockRequest
...
Signed-off-by: Stanislav Bondarenko <stanislav.bondarenko@gmail.com >
Upstream-commit: 0fd5a654280ef509a6512f84981f28d559869b90
Component: engine
2017-08-23 17:10:04 -04:00
b9dc5995dc
Merge pull request #34597 from cpuguy83/34587_address_nits
...
Add more detailed logging to aufs init
Upstream-commit: cdf870bd0b5fa678b10ef2708cca7ad776b4913c
Component: engine
2017-08-23 10:48:40 -07:00
95903f50f1
Host-mode IPC sharing not possible in a userns
...
This test is the API version of a docker_cli_run_test that was already
disabled from userns, but when ported to API didn't retain the same test
requirements. Specifically, a user namespaced process will not have
access to the host namespace's IPC devices and is already documented as
such in the user namespace restrictions docs.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
Upstream-commit: d9f3548a936991594095c12b7271ce3387f4025c
Component: engine
2017-08-23 10:37:47 -07:00
eec82cc7b5
Merge pull request #34600 from dnephin/remove-pkg-testutil
...
Remove pkg/testutil/utils.go
Upstream-commit: 59e1565565071da160a0ad3781335e4f974f93f8
Component: engine
2017-08-23 09:38:20 -07:00
c8bdd05225
Merge pull request #34602 from stevvooe/normalize-normalise
...
*: normalize the use of normalize
Upstream-commit: 88c0317e23449d6ff730a1073f240586cbdfd4ba
Component: engine
2017-08-23 09:13:08 +02:00
e0c85257a0
Merge pull request #34568 from Microsoft/jjh/singletagstore
...
Move to a single tag-store
Upstream-commit: 3d22daeb835a74ef886ce28c35f6c391cd6d24ad
Component: engine
2017-08-22 17:50:36 -07:00
b680839840
*: normalize the use of normalize
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
Upstream-commit: ae8dbeaeedce3a9f247f2d58df7459f9d79bde5d
Component: engine
2017-08-22 15:25:31 -07: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
561acebc80
Merge pull request #34570 from simonvik/doublealarm
...
Remove double defined alarm in seccomp list.
Upstream-commit: f291c959ef6294757db92be5e2add774ceda60cc
Component: engine
2017-08-22 12:50:21 -07:00
80226e2163
Add more detailed logging to aufs init
...
Addresses some comments on 276b44608b04f08bdf46ce7c816b1f744bf24b7d
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 0a98025d4b2910c2089325b87d28c32d05803e13
Component: engine
2017-08-22 14:19:03 -04:00
e12074fbb5
Merge pull request #34587 from cpuguy83/aufs_rm_errors
...
Fix error removing diff path
Upstream-commit: bbcdc7df34eeb01c2f5741235f26f90749e67a05
Component: engine
2017-08-22 11:02:30 -07:00
7b15e791ed
Fix error removing diff path
...
In d42dbdd3d48d0134f8bba7ead92a7067791dffab the code was re-arranged to
better report errors, and ignore non-errors.
In doing so we removed a deferred remove of the AUFS diff path, but did
not replace it with a non-deferred one.
This fixes the issue and makes the code a bit more readable.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 276b44608b04f08bdf46ce7c816b1f744bf24b7d
Component: engine
2017-08-22 12:51:58 -04:00
c49d8409df
Merge pull request #34594 from tizhou86/master
...
Fix typo in docs/api/version-history.md
Upstream-commit: 76a7f05795df38cc5a720fa52d37f4a2bc23b015
Component: engine
2017-08-22 06:19:46 -07:00
fb9a7edb75
Merge pull request #31727 from sascha-andres/31726-le-lion-only
...
Log payload only [logentries]
Upstream-commit: b3b630655dfe8bcaa35af9ece296189660ed22ae
Component: engine
2017-08-22 14:59:28 +02:00
8fc04bd8d4
Merge pull request #34588 from dnephin/more-linters
...
Add deadcode and goimports linters
Upstream-commit: 6540d5581473c292ade46ee1b620172441943f4b
Component: engine
2017-08-22 05:12:50 -07:00
7cc406aa10
Merge pull request #34572 from krizalys/hyphenless-bind-mount
...
Dropped hyphen in bind mount where appropriate
Upstream-commit: 28362f11d73b5b72ff9d7eba27cf9f817ec86ef8
Component: engine
2017-08-22 05:11:46 -07:00
d06d19b543
Fixed typo in docs/api/version-history.md
...
Signed-off-by: Ti Zhou <tizhou1986@gmail.com >
Upstream-commit: a35bfd0b43b132754c9a06d69802d69bddfd829f
Component: engine
2017-08-22 16:47:08 +08:00
08c57e48ed
Update Windows and LCOW to use v1.0.0 runtime-spec
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 7c29103ad9b4e02ecc6cdde01da9c3675a377fc4
Component: engine
2017-08-21 15:19:31 -07: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
6b3b192846
Add goimports to linters.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 372670b5074b077927314cdf46af30f8752e7db0
Component: engine
2017-08-21 18:15:08 -04:00
5305a1cd9e
Update containerd to 06b9cb35161009dcb7123345749fef02f7cea8e0
...
This also update:
- runc to 3f2f8b84a77f73d38244dd690525642a72156c64
- runtime-specs to v1.0.0
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com >
Upstream-commit: 45d85c99139bbd16004bbedb7d5bac6a60264538
Component: engine
2017-08-21 12:04:07 -07:00
4f846a2e15
Use event functions from golang.org/x/sys/windows
...
Use CreateEvent, OpenEvent (which both map to the respective *EventW
function) and PulseEvent from golang.org/x/sys instead of local copies.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: e942513ac46656c3f54cd103e990e2b7bd5c2b14
Component: engine
2017-08-21 12:58:09 +02:00
3bf60d04de
vendor: re-vendor golang.org/x/sys
...
Update golang.org/x/sys to 07c182904dbd53199946ba614a412c61d3c548f5 in
order to get the newly added Windows event functions which will be used
in successive commits.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch >
Upstream-commit: df58f40a47ea4ee462eb88d3e695bec93c99a6bb
Component: engine
2017-08-21 12:48:05 +02:00
1c65c425a3
Merge pull request #34560 from dnephin/remove-some-cli-tests
...
Remove a couple cli tests, which are now unit tests in docker/cli
Upstream-commit: 361a473121f2cd4e688a3bb71fbeff00aaf674d7
Component: engine
2017-08-19 14:31:05 -07:00
0f9c6d96f0
Merge pull request #34551 from dnephin/use-gometalinter
...
Use gometalinter for linting
Upstream-commit: 4c8cde597daf3d96f74d3b6c4ff3a23e51f8abd3
Component: engine
2017-08-19 09:40:47 -07:00
3c66acc139
Dropped hyphen in bind mount where appropriate
...
Signed-off-by: Christophe Vidal <kriss@krizalys.com >
Upstream-commit: dffa5d6df2e51556edfbcebc4695fdbc0bcc1a90
Component: engine
2017-08-19 21:25:07 +07:00
bffaf97a87
Remove double defined alarm
...
Signed-off-by: Simon Vikstrom <pullreq@devsn.se >
Upstream-commit: d7bf5e3b4db05b64d969127f6465f47cf4fe97d0
Component: engine
2017-08-19 09:55:03 +02:00
