From e5dd0c19d9d7b0bdf3caff9924d50ebdc313d3be Mon Sep 17 00:00:00 2001 From: Daniel Dao Date: Mon, 27 Nov 2017 14:01:24 +0000 Subject: [PATCH 1/2] remove import of opencontainers/runc in windows We are planning to remove supports for non-Linux platform in runc (https://github.com/opencontainers/runc/pull/1654). The current import here is the only thing that i found in docker that is windows-related so fixing this would remove the rest of windows code in runc. This changes some functions in daemon_windows to be the same as daemon_unix to use runtime-spec public API instead of runc. Signed-off-by: Daniel Dao Upstream-commit: 4d1d486202a7c3977e51275c2efdba922375b0cd Component: engine --- components/engine/daemon/daemon_windows.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/daemon/daemon_windows.go b/components/engine/daemon/daemon_windows.go index 8029bbf0ef..33ecf7a3f5 100644 --- a/components/engine/daemon/daemon_windows.go +++ b/components/engine/daemon/daemon_windows.go @@ -26,7 +26,7 @@ import ( winlibnetwork "github.com/docker/libnetwork/drivers/windows" "github.com/docker/libnetwork/netlabel" "github.com/docker/libnetwork/options" - blkiodev "github.com/opencontainers/runc/libcontainer/configs" + specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" @@ -47,7 +47,7 @@ func getPluginExecRoot(root string) string { return filepath.Join(root, "plugins") } -func getBlkioWeightDevices(config *containertypes.HostConfig) ([]blkiodev.WeightDevice, error) { +func getBlkioWeightDevices(config containertypes.Resources) ([]specs.LinuxWeightDevice, error) { return nil, nil } From 4a3429a76269c0a24b2e09dbf965d9a43f0fbed8 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Wed, 13 Dec 2017 17:31:28 +0000 Subject: [PATCH 2/2] Remove getBlkioWeightDevices in daemon_windows.go as it is not needed Signed-off-by: Yong Tang Upstream-commit: 0866dee5fdb039adf73cd99e23bc5382a3dc8610 Component: engine --- components/engine/daemon/daemon_windows.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/components/engine/daemon/daemon_windows.go b/components/engine/daemon/daemon_windows.go index 33ecf7a3f5..8582d4e580 100644 --- a/components/engine/daemon/daemon_windows.go +++ b/components/engine/daemon/daemon_windows.go @@ -26,7 +26,6 @@ import ( winlibnetwork "github.com/docker/libnetwork/drivers/windows" "github.com/docker/libnetwork/netlabel" "github.com/docker/libnetwork/options" - specs "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" "golang.org/x/sys/windows" @@ -47,10 +46,6 @@ func getPluginExecRoot(root string) string { return filepath.Join(root, "plugins") } -func getBlkioWeightDevices(config containertypes.Resources) ([]specs.LinuxWeightDevice, error) { - return nil, nil -} - func (daemon *Daemon) parseSecurityOpt(container *container.Container, hostConfig *containertypes.HostConfig) error { return parseSecurityOpt(container, hostConfig) }