Merge pull request #14516 from Microsoft/10662-mergeLXCconf

Windows: Tidy up daemon\utils*.go

daemon/utils_linux.go

@@ -1,17 +0,0 @@
-// +build linux
-
-package daemon
-
-import "github.com/docker/libcontainer/selinux"
-
-func selinuxSetDisabled() {
-	selinux.SetDisabled()
-}
-
-func selinuxFreeLxcContexts(label string) {
-	selinux.FreeLxcContexts(label)
-}
-
-func selinuxEnabled() bool {
-	return selinux.SelinuxEnabled()
-}

daemon/utils_test.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package daemon
 
 import (

daemon/utils_unix.go

@@ -1,3 +1,5 @@
+// +build linux
+
 package daemon
 
 import (
@@ -6,8 +8,21 @@ import (
 	"strings"
 
 	"github.com/docker/docker/runconfig"
+	"github.com/docker/libcontainer/selinux"
 )
 
+func selinuxSetDisabled() {
+	selinux.SetDisabled()
+}
+
+func selinuxFreeLxcContexts(label string) {
+	selinux.FreeLxcContexts(label)
+}
+
+func selinuxEnabled() bool {
+	return selinux.SelinuxEnabled()
+}
+
 func mergeLxcConfIntoOptions(hostConfig *runconfig.HostConfig) ([]string, error) {
 	if hostConfig == nil {
 		return nil, nil