1. docker
  2. Commit b10dd17e066614dce1bcaafebf6e902ce9ea169d
Browse code

Don't build utils on Windows

Signed-off-by: John Howard <jhoward@microsoft.com>

John Howard authored on 2015/11/08 01:46:36
Showing 2 changed files
daemon/execdriver/utils.go
History View file @ b10dd17
1 1 
deleted file mode 100644
... ... 
@@ -1,123 +0,0 @@
1 
-package execdriver
2 
-
3 
-import (
4 
-	"fmt"
5 
-	"strings"
6 
-
7 
-	"github.com/docker/docker/pkg/stringutils"
8 
-	"github.com/syndtr/gocapability/capability"
9 
-)
10 
-
11 
-var capabilityList Capabilities
12 
-
13 
-func init() {
14 
-	last := capability.CAP_LAST_CAP
15 
-	// hack for RHEL6 which has no /proc/sys/kernel/cap_last_cap
16 
-	if last == capability.Cap(63) {
17 
-		last = capability.CAP_BLOCK_SUSPEND
18 
-	}
19 
-	for _, cap := range capability.List() {
20 
-		if cap > last {
21 
-			continue
22 
-		}
23 
-		capabilityList = append(capabilityList,
24 
-			&CapabilityMapping{
25 
-				Key:   strings.ToUpper(cap.String()),
26 
-				Value: cap,
27 
-			},
28 
-		)
29 
-	}
30 
-}
31 
-
32 
-type (
33 
-	// CapabilityMapping maps linux capability name to its value of capability.Cap type
34 
-	// Capabilities is one of the security systems in Linux Security Module (LSM)
35 
-	// framework provided by the kernel.
36 
-	// For more details on capabilities, see http://man7.org/linux/man-pages/man7/capabilities.7.html
37 
-	CapabilityMapping struct {
38 
-		Key   string         `json:"key,omitempty"`
39 
-		Value capability.Cap `json:"value,omitempty"`
40 
-	}
41 
-	// Capabilities contains all CapabilityMapping
42 
-	Capabilities []*CapabilityMapping
43 
-)
44 
-
45 
-// String returns <key> of CapabilityMapping
46 
-func (c *CapabilityMapping) String() string {
47 
-	return c.Key
48 
-}
49 
-
50 
-// GetCapability returns CapabilityMapping which contains specific key
51 
-func GetCapability(key string) *CapabilityMapping {
52 
-	for _, capp := range capabilityList {
53 
-		if capp.Key == key {
54 
-			cpy := *capp
55 
-			return &cpy
56 
-		}
57 
-	}
58 
-	return nil
59 
-}
60 
-
61 
-// GetAllCapabilities returns all of the capabilities
62 
-func GetAllCapabilities() []string {
63 
-	output := make([]string, len(capabilityList))
64 
-	for i, capability := range capabilityList {
65 
-		output[i] = capability.String()
66 
-	}
67 
-	return output
68 
-}
69 
-
70 
-// TweakCapabilities can tweak capabilities by adding or dropping capabilities
71 
-// based on the basics capabilities.
72 
-func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
73 
-	var (
74 
-		newCaps []string
75 
-		allCaps = GetAllCapabilities()
76 
-	)
77 
-
78 
-	// look for invalid cap in the drop list
79 
-	for _, cap := range drops {
80 
-		if strings.ToLower(cap) == "all" {
81 
-			continue
82 
-		}
83 
-		if !stringutils.InSlice(allCaps, cap) {
84 
-			return nil, fmt.Errorf("Unknown capability drop: %q", cap)
85 
-		}
86 
-	}
87 
-
88 
-	// handle --cap-add=all
89 
-	if stringutils.InSlice(adds, "all") {
90 
-		basics = allCaps
91 
-	}
92 
-
93 
-	if !stringutils.InSlice(drops, "all") {
94 
-		for _, cap := range basics {
95 
-			// skip `all` already handled above
96 
-			if strings.ToLower(cap) == "all" {
97 
-				continue
98 
-			}
99 
-
100 
-			// if we don't drop `all`, add back all the non-dropped caps
101 
-			if !stringutils.InSlice(drops, cap) {
102 
-				newCaps = append(newCaps, strings.ToUpper(cap))
103 
-			}
104 
-		}
105 
-	}
106 
-
107 
-	for _, cap := range adds {
108 
-		// skip `all` already handled above
109 
-		if strings.ToLower(cap) == "all" {
110 
-			continue
111 
-		}
112 
-
113 
-		if !stringutils.InSlice(allCaps, cap) {
114 
-			return nil, fmt.Errorf("Unknown capability to add: %q", cap)
115 
-		}
116 
-
117 
-		// add cap if not already in the list
118 
-		if !stringutils.InSlice(newCaps, cap) {
119 
-			newCaps = append(newCaps, strings.ToUpper(cap))
120 
-		}
121 
-	}
122 
-	return newCaps, nil
123 
-}
daemon/execdriver/utils_unix.go
History View file @ b10dd17
124 1 
new file mode 100644
... ... 
@@ -0,0 +1,125 @@
0 
+// +build !windows
1 
+
2 
+package execdriver
3 
+
4 
+import (
5 
+	"fmt"
6 
+	"strings"
7 
+
8 
+	"github.com/docker/docker/pkg/stringutils"
9 
+	"github.com/syndtr/gocapability/capability"
10 
+)
11 
+
12 
+var capabilityList Capabilities
13 
+
14 
+func init() {
15 
+	last := capability.CAP_LAST_CAP
16 
+	// hack for RHEL6 which has no /proc/sys/kernel/cap_last_cap
17 
+	if last == capability.Cap(63) {
18 
+		last = capability.CAP_BLOCK_SUSPEND
19 
+	}
20 
+	for _, cap := range capability.List() {
21 
+		if cap > last {
22 
+			continue
23 
+		}
24 
+		capabilityList = append(capabilityList,
25 
+			&CapabilityMapping{
26 
+				Key:   strings.ToUpper(cap.String()),
27 
+				Value: cap,
28 
+			},
29 
+		)
30 
+	}
31 
+}
32 
+
33 
+type (
34 
+	// CapabilityMapping maps linux capability name to its value of capability.Cap type
35 
+	// Capabilities is one of the security systems in Linux Security Module (LSM)
36 
+	// framework provided by the kernel.
37 
+	// For more details on capabilities, see http://man7.org/linux/man-pages/man7/capabilities.7.html
38 
+	CapabilityMapping struct {
39 
+		Key   string         `json:"key,omitempty"`
40 
+		Value capability.Cap `json:"value,omitempty"`
41 
+	}
42 
+	// Capabilities contains all CapabilityMapping
43 
+	Capabilities []*CapabilityMapping
44 
+)
45 
+
46 
+// String returns <key> of CapabilityMapping
47 
+func (c *CapabilityMapping) String() string {
48 
+	return c.Key
49 
+}
50 
+
51 
+// GetCapability returns CapabilityMapping which contains specific key
52 
+func GetCapability(key string) *CapabilityMapping {
53 
+	for _, capp := range capabilityList {
54 
+		if capp.Key == key {
55 
+			cpy := *capp
56 
+			return &cpy
57 
+		}
58 
+	}
59 
+	return nil
60 
+}
61 
+
62 
+// GetAllCapabilities returns all of the capabilities
63 
+func GetAllCapabilities() []string {
64 
+	output := make([]string, len(capabilityList))
65 
+	for i, capability := range capabilityList {
66 
+		output[i] = capability.String()
67 
+	}
68 
+	return output
69 
+}
70 
+
71 
+// TweakCapabilities can tweak capabilities by adding or dropping capabilities
72 
+// based on the basics capabilities.
73 
+func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
74 
+	var (
75 
+		newCaps []string
76 
+		allCaps = GetAllCapabilities()
77 
+	)
78 
+
79 
+	// look for invalid cap in the drop list
80 
+	for _, cap := range drops {
81 
+		if strings.ToLower(cap) == "all" {
82 
+			continue
83 
+		}
84 
+		if !stringutils.InSlice(allCaps, cap) {
85 
+			return nil, fmt.Errorf("Unknown capability drop: %q", cap)
86 
+		}
87 
+	}
88 
+
89 
+	// handle --cap-add=all
90 
+	if stringutils.InSlice(adds, "all") {
91 
+		basics = allCaps
92 
+	}
93 
+
94 
+	if !stringutils.InSlice(drops, "all") {
95 
+		for _, cap := range basics {
96 
+			// skip `all` already handled above
97 
+			if strings.ToLower(cap) == "all" {
98 
+				continue
99 
+			}
100 
+
101 
+			// if we don't drop `all`, add back all the non-dropped caps
102 
+			if !stringutils.InSlice(drops, cap) {
103 
+				newCaps = append(newCaps, strings.ToUpper(cap))
104 
+			}
105 
+		}
106 
+	}
107 
+
108 
+	for _, cap := range adds {
109 
+		// skip `all` already handled above
110 
+		if strings.ToLower(cap) == "all" {
111 
+			continue
112 
+		}
113 
+
114 
+		if !stringutils.InSlice(allCaps, cap) {
115 
+			return nil, fmt.Errorf("Unknown capability to add: %q", cap)
116 
+		}
117 
+
118 
+		// add cap if not already in the list
119 
+		if !stringutils.InSlice(newCaps, cap) {
120 
+			newCaps = append(newCaps, strings.ToUpper(cap))
121 
+		}
122 
+	}
123 
+	return newCaps, nil
124 
+}