From ffc791cc0a4f161c83cf6ca948107e6f55b44096 Mon Sep 17 00:00:00 2001 From: Arnaud Rebillout Date: Thu, 10 Oct 2019 20:42:00 +0700 Subject: [PATCH] Disable Microsoft/hcsshim As far as I understand, this is only needed for Docker running on a Windows host. Grepping the code shows that only Windows specific files import Microsoft/hcsshim. The only exception is the file `libcontainerd/remote/client.go`. Forwarded: https://github.com/moby/moby/issues/40067 Signed-off-by: Arnaud Rebillout Gbp-Pq: Name engine-disable-microsoft-hcsshim.patch --- engine/libcontainerd/remote/client.go | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/engine/libcontainerd/remote/client.go b/engine/libcontainerd/remote/client.go index 06d8d9c0..3c5060c0 100644 --- a/engine/libcontainerd/remote/client.go +++ b/engine/libcontainerd/remote/client.go @@ -13,7 +13,8 @@ import ( "syscall" "time" - "github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" + // DM - This is Windows only + //"github.com/Microsoft/hcsshim/cmd/containerd-shim-runhcs-v1/options" "github.com/containerd/containerd" apievents "github.com/containerd/containerd/api/events" "github.com/containerd/containerd/api/types" @@ -206,9 +207,10 @@ func (c *client) Start(ctx context.Context, id, checkpointDir string, withStdin } } else { // Make sure we set the runhcs options to debug if we are at debug level. - if c.logger.Level == logrus.DebugLevel { - info.Options = &options.Options{Debug: true} - } + // DM - This is Windows only + //if c.logger.Level == logrus.DebugLevel { + // info.Options = &options.Options{Debug: true} + //} } return nil }) -- 2.30.2