make cgroup imports linux-only

Author: liggitt

pkg/build/builder/util.go

@@ -12,7 +12,6 @@ import (
 	"strings"
 
 	docker "github.com/fsouza/go-dockerclient"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
 
 	s2iapi "github.com/openshift/source-to-image/pkg/api"
 
@@ -174,17 +173,6 @@ func addBuildLabels(labels map[string]string, build *buildapi.Build) {
 	labels[buildapi.DefaultDockerLabelNamespace+"build.namespace"] = build.Namespace
 }
 
-// getCgroupParent determines the parent cgroup for a container from
-// within that container.
-func getCgroupParent() (string, error) {
-	cgMap, err := cgroups.ParseCgroupFile("/proc/self/cgroup")
-	if err != nil {
-		return "", err
-	}
-	glog.V(6).Infof("found cgroup values map: %v", cgMap)
-	return extractParentFromCgroupMap(cgMap)
-}
-
 // extractParentFromCgroupMap finds the cgroup parent in the cgroup map
 func extractParentFromCgroupMap(cgMap map[string]string) (string, error) {
 	memory, ok := cgMap["memory"]

pkg/build/builder/util_linux.go

@@ -0,0 +1,18 @@
+// +build linux
+
+package builder
+
+import (
+	"github.com/opencontainers/runc/libcontainer/cgroups"
+)
+
+// getCgroupParent determines the parent cgroup for a container from
+// within that container.
+func getCgroupParent() (string, error) {
+	cgMap, err := cgroups.ParseCgroupFile("/proc/self/cgroup")
+	if err != nil {
+		return "", err
+	}
+	glog.V(6).Infof("found cgroup values map: %v", cgMap)
+	return extractParentFromCgroupMap(cgMap)
+}

pkg/build/builder/util_unsupported.go

@@ -0,0 +1,11 @@
+// +build !linux
+
+package builder
+
+import "errors"
+
+// getCgroupParent determines the parent cgroup for a container from
+// within that container.
+func getCgroupParent() (string, error) {
+	return "", errors.New("getCgroupParent is unsupported on this platform")
+}