Browse code
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 <dqminh89@gmail.com>
Daniel Dao authored on 2017/11/27 23:01:24Showing 1 changed files
| ... | ... |
@@ -26,7 +26,7 @@ import ( |
| 26 | 26 |
winlibnetwork "github.com/docker/libnetwork/drivers/windows" |
| 27 | 27 |
"github.com/docker/libnetwork/netlabel" |
| 28 | 28 |
"github.com/docker/libnetwork/options" |
| 29 |
- blkiodev "github.com/opencontainers/runc/libcontainer/configs" |
|
| 29 |
+ specs "github.com/opencontainers/runtime-spec/specs-go" |
|
| 30 | 30 |
"github.com/pkg/errors" |
| 31 | 31 |
"github.com/sirupsen/logrus" |
| 32 | 32 |
"golang.org/x/sys/windows" |
| ... | ... |
@@ -47,7 +47,7 @@ func getPluginExecRoot(root string) string {
|
| 47 | 47 |
return filepath.Join(root, "plugins") |
| 48 | 48 |
} |
| 49 | 49 |
|
| 50 |
-func getBlkioWeightDevices(config *containertypes.HostConfig) ([]blkiodev.WeightDevice, error) {
|
|
| 50 |
+func getBlkioWeightDevices(config containertypes.Resources) ([]specs.LinuxWeightDevice, error) {
|
|
| 51 | 51 |
return nil, nil |
| 52 | 52 |
} |
| 53 | 53 |
|