kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35788 from yongtang/35609-carry

Browse source 
Carry #35609 (remove import of opencontainers/runc in windows)
This commit is contained in:
Michael Crosby 2017-12-13 15:56:31 -05:00 committed by GitHub
commit 1cea9d3bdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
daemon/daemon_windows.go
View file

@ -26,7 +26,6 @@ import (
winlibnetwork "github.com/docker/libnetwork/drivers/windows" winlibnetwork "github.com/docker/libnetwork/drivers/windows"
"github.com/docker/libnetwork/netlabel" "github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/options" "github.com/docker/libnetwork/options"
blkiodev "github.com/opencontainers/runc/libcontainer/configs"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
@ -47,10 +46,6 @@ func getPluginExecRoot(root string) string {
return filepath.Join(root, "plugins") return filepath.Join(root, "plugins")
} }
func getBlkioWeightDevices(config *containertypes.HostConfig) ([]blkiodev.WeightDevice, error) {
return nil, nil
}
func (daemon *Daemon) parseSecurityOpt(container *container.Container, hostConfig *containertypes.HostConfig) error { func (daemon *Daemon) parseSecurityOpt(container *container.Container, hostConfig *containertypes.HostConfig) error {
return parseSecurityOpt(container, hostConfig) return parseSecurityOpt(container, hostConfig)
} }