summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Revert "hack: temporarily disable deprecate-integration-cli"Sebastiaan van Stijn2019-12-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 5f67568bfd08a10f51a819cae8696f591881f26b. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | Merge pull request #39998 from thaJeztah/carry_39971_unittests_junit_1Sebastiaan van Stijn2019-12-234-24/+120
|\ \ \ \ | | | | | | | | | | Windows: Build and use gotestsum for running all tests
| * | | | Build and use gotestsum for running all testsVikram bir Singh2019-12-194-24/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Dockerfile.Windows modified to build gotestsum.exe 2. Use gotestsum.exe in invoking the execution of: (a) Unit tests (run in containers), (b) Integration tests (run outside containers) (c) Integration-cli (run outside containers) No changes made to other categories of tests (e.g. LCOW). 3. Copy .xml files produced by gotestsum in appropriate paths where Jenkins can ingest them 4. Modify Jenkinsfile to mark results output as being jUnit "type" as well as to archive the .xml test result files as artifacts. Signed-off-by: Vikram bir Singh <vikrambir.singh@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | Merge pull request #40146 from thaJeztah/move_hcsshimBrian Goff2019-12-193-19/+38
|\ \ \ \ \ | | | | | | | | | | | | libcontainerd: move hcsshim import to windows-only file
| * | | | | libcontainerd: move hcsshim import to windows-only fileSebastiaan van Stijn2019-12-103-19/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reduces the dependency-graph when building packages for Linux only. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | Merge pull request #40246 from thaJeztah/system_windows_cleanupBrian Goff2019-12-193-9/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | pkg/system: minor cleanups and remove use of deprecated system.GetOSVersion()
| * | | | | | daemon: remove use of deprecated system.GetOSVersion()Sebastiaan van Stijn2019-11-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | pkg/parsers: remove use of deprecated system.GetOSVersion()Sebastiaan van Stijn2019-11-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | pkg/system/windows: remove unnecessary conversionsSebastiaan van Stijn2019-11-251-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | pkg/system/windows: remove obsolete commentSebastiaan van Stijn2019-11-251-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | Merge pull request #40247 from thaJeztah/pkg_system_constsBrian Goff2019-12-192-26/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | pkg/system: deprecate constants in favor of golang.org/x/sys/windows
| * | | | | | | builder: remove use of deprecated pkg/system constantsSebastiaan van Stijn2019-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | pkg/system: deprecate constants in favor of golang.org/x/sys/windowsSebastiaan van Stijn2019-11-251-25/+26
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | Merge pull request #40312 from thaJeztah/carry_40276_bump_x_sysBrian Goff2019-12-19101-36572/+40858
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | update vendor golang.org/x/sys to 6d18c012aee9febd81bbf9806760c8c4480e870d
| * | | | | | | update vendor golang.org/x/sys to 6d18c012aee9febd81bbf9806760c8c4480e870dliuxiaodong2019-12-16101-36572/+40858
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/golang/sys/compare/c990c680b611ac1aeb7d8f2af94a825f98d69720...6d18c012aee9febd81bbf9806760c8c4480e870d execute "docker run -it {image name} /bin/sh" no response on mip64el platform; EpollEvent struct define lack a field named PadFd; add the field "PadFd"; execute docker run -it {image} /bin/sh for test after rebuilded. Signed-off-by: liuxiaodong <liuxiaodong@loongson.cn> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | Merge pull request #40257 from thaJeztah/bump_go_runcBrian Goff2019-12-192-7/+7
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7def
| * | | | | | | bump containerd/go-runc a2952bc25f5116103a8b78f3817f6df759aa7defSebastiaan van Stijn2019-11-262-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/containerd/go-runc/compare/e029b79d8cda8374981c64eba71f28ec38e5526f...a2952bc25f5116103a8b78f3817f6df759aa7def - containerd/go-runc#56 fix typo in successfully Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | Merge pull request #40193 from vikramhh/volumes_plugins_test_failureBrian Goff2019-12-191-3/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Volume plugin tests [integration/plugin/volumes] should always be executed - checks for OS Type should happen within the test
| * | | | | | | | Check for OS Type and skip within the testvikrambirsingh2019-11-071-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Premature check for OS type means that the test will never even get to run on other OS types. This will cause it to be always flagged as a failure on such OS types. Signed-off-by: vikrambirsingh <vikrambir.singh@docker.com>
* | | | | | | | | Merge pull request #40259 from thaJeztah/more_constantsTibor Vass2019-12-191-6/+8
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | | api/server/router: use consts for HTTP methods
| * | | | | | | | api/server/router: use consts for HTTP methodsSebastiaan van Stijn2019-11-261-6/+8
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | Merge pull request #40317 from AkihiroSuda/bump-up-rootlesskitTianon Gravi2019-12-181-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | rootless: fix proxying UDP packets
| * | | | | | | | rootless: fix proxying UDP packetsAkihiro Suda2019-12-181-2/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UDP reply packets were not proxied: https://github.com/rootless-containers/rootlesskit/issues/86 The issue was fixed in RootlessKit v0.7.1: https://github.com/rootless-containers/rootlesskit/pull/87 Full changes since v0.7.0: https://github.com/rootless-containers/rootlesskit/compare/v0.7.0...v0.7.1 Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
* | | | | | | | Merge pull request #40074 from yedamao/fix-integration-cliAkihiro Suda2019-12-193-56/+83
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | integration-cli: Fix `SA1019: httputil.ClientConn is deprecated`
| * | | | | | | | integration-cli: Fix `SA1019: httputil.ClientConn is deprecated`HuanHuan Ye2019-10-223-56/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite sockRequestHijack to requestHijack which use writable Transport's Response.Body to replace deprecated hijacked httputil.ClientConn. ``` // As of Go 1.12, the Body will also implement io.Writer // on a successful "101 Switching Protocols" response, // as used by WebSockets and HTTP/2's "h2c" mode. Body io.ReadCloser ```. TestPostContainersAttach and TestExecResizeImmediatelyAfterExecStart replace all sockRequestHijack to requestHijack. Signed-off-by: HuanHuan Ye <logindaveye@gmail.com>
* | | | | | | | | Merge pull request #40268 from olljanat/garbage-collector-remove-layerdb-valuesBrian Goff2019-12-183-3/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | Make sure that layers are removed from layerdb after succefull layer …
| * | | | | | | | Make sure that layers are removed from layerdb after succefull layer removalOlli Janatuinen2019-11-283-3/+9
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com>
* | | | | | | | Merge pull request #40108 from thaJeztah/bump_grpcSebastiaan van Stijn2019-12-134-3/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | bump google.golang.org/grpc v1.23.1
| * | | | | | | | bump google.golang.org/grpc v1.23.1Sebastiaan van Stijn2019-10-224-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | full diff: https://github.com/grpc/grpc-go/compare/v1.23.0...v1.23.1 - grpc/grpc-go#3018 server: set and advertise max frame size of 16KB - grpc/grpc-go#3017 grpclb: fix deadlock in grpclb connection cache - Before the fix, if the timer to remove a SubConn fires at the same time NewSubConn cancels the timer, it caused a mutex leak and deadlock. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | | Merge pull request #39845 from thaJeztah/re_enable_TestRunAttachFailedNoLeakSebastiaan van Stijn2019-12-131-15/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | integration-cli: re-enable TestRunAttachFailedNoLeak on RS3
| * | | | | | | | | integration-cli: re-enable TestRunAttachFailedNoLeak on RS3Sebastiaan van Stijn2019-12-121-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This test was temporarily disabled (see moby/moby#35023) because of a bug in Windows RS3 and RS4 causing duplicate port mappings to not be detected, and not causing an error. This bug was fixed as MSFT:14083260 on 10/31/2017, and backported to RS3 in November/December 2017. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
* | | | | | | | | | Merge pull request #40142 from ↵Akihiro Suda2019-12-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jmartin84/unique-names-intergration-service-inspect-test refactored integration/service/instead_test.go to ues unique resource…
| * | | | | | | | | | refactored integration/service/instead_test.go to ues unique resource namesJusten Martin2019-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Justen Martin <jmart@the-coder.com>
* | | | | | | | | | | Merge pull request #40238 from Toasterson/patch-1Sebastiaan van Stijn2019-12-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Allow client consumers like traefik to compile on illumos
| * | | | | | | | | | Allow client consumers like traefik to compile on illumosTill Wegmüller2019-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Till Wegmüller <toasterson@gmail.com>
* | | | | | | | | | | Merge pull request #40263 from thaJeztah/normalize_commentsBrian Goff2019-12-1265-189/+180
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Normalize comment formatting
| * | | | | | | | | | | registry: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | image: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | client: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | builder/remotecontext: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | libcontainerd: normalize comment formattingSebastiaan van Stijn2019-11-272-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | daemon: normalize comment formattingSebastiaan van Stijn2019-11-277-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | daemon/graphdriver: normalize comment formattingSebastiaan van Stijn2019-11-277-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | daemon/cluster: normalize comment formattingSebastiaan van Stijn2019-11-274-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | daemon/logger: normalize comment formattingSebastiaan van Stijn2019-11-272-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | pkg/tailfile: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | pkg/signal: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | pkg/progress: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | pkg/mount: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
| * | | | | | | | | | | pkg/jsonmessage: normalize comment formattingSebastiaan van Stijn2019-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Sebastiaan van Stijn <github@gone.nl>