Disable Microsoft/hcsshim
authorArnaud Rebillout <arnaud.rebillout@collabora.com>
Thu, 10 Oct 2019 13:42:00 +0000 (20:42 +0700)
committerDmitry Smirnov <onlyjob@debian.org>
Tue, 12 Nov 2019 01:18:22 +0000 (01:18 +0000)
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

engine/libcontainerd/remote/client.go

index 06d8d9c041ecf5bf4b4d10a12f04115c4c047823..3c5060c0fef12128a81c4e0ee4ce21fd60f59ee3 100644 (file)
@@ -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
                })