Refactor userns_remap.go to use docker info to identify userns

utsavanand2 · Nov 29, 2018 · 8775a6d · 8775a6d
1 parent 4249aea
commit 8775a6d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pkg/docker/userns_remap.go b/pkg/docker/userns_remap.go
@@ -24,13 +24,13 @@ import (
 
 // UsernsRemap checks if userns-remap is enabled in dockerd
 func UsernsRemap() bool {
-	cmd := exec.Command("cat", "/etc/docker/daemon.json")
+	cmd := exec.Command("docker", "info", "--format", "'{{json .SecurityOptions}}'")
 	lines, err := exec.CombinedOutputLines(cmd)
 	if err != nil {
 		return false
 	}
-	for _, l := range lines {
-		if strings.Contains(l, "userns-remap") {
+	if len(lines) > 0 {
+		if strings.Contains(lines[0], "name=userns") {
 			return true
 		}
 	}