From: Arnaud Rebillout <arnaud.rebillout@collabora.com>
Date: Thu, 10 Oct 2019 13:42:00 +0000 (+0700)
Subject: Disable Microsoft/hcsshim
X-Git-Tag: archive/raspbian/19.03.4+dfsg2-2+rpi1^2~18
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ffc791cc0a4f161c83cf6ca948107e6f55b44096;p=docker.io.git

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 <arnaud.rebillout@collabora.com>

Gbp-Pq: Name engine-disable-microsoft-hcsshim.patch
---

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
 		})