update patterns and allow external config of devices

Author: ChristianKniep

doxy.pattern

@@ -4,6 +4,8 @@
 ^/(v\d\.\d+/)?services(/[0-9a-f]+)?$
 # List and inspect tasks
 ^/(v\d\.\d+/)?tasks(/\w+)?$
+# List and inspect images
+^/(v\d\.\d+/)?images(/\w+)?$
 # List and inspect networks
 ^/(v\d\.\d+/)?networks(/\w+)?$
 # List and inspect volumes
@@ -16,5 +18,3 @@
 ^/(v\d\.\d+/)?version$
 # Healthcheck
 ^/_ping$
-# List and inspect images
-^/(v\d\.\d+/)?images(/\w+)?$

main.go

@@ -59,6 +59,12 @@ var (
 		Usage: "File holding line-separated regex-patterns to be allowed (comments allowed, use #)",
 		EnvVar: "DOXY_PATTERN_FILE",
 	}
+	deviceFileFlag = cli.StringFlag{
+		Name:  "device-file",
+		Value: proxy.DEVICE_FILE,
+		Usage: "File holding line-separated devices to be mapped in when in (GPU|HPC) mode (comments allowed, use #)",
+		EnvVar: "DOXY_DEVICE_FILE",
+	}
 )
 
 func EvalOptions(cfg *config.Config) (po []proxy.ProxyOption) {
@@ -90,10 +96,25 @@ func EvalPatternOpts(cfg *config.Config) (proxy.ProxyOption) {
 		os.Exit(1)
 
 	}
-	patterns, err  = proxy.ReadPatterns(reader)
+	patterns, err  = proxy.ReadLineFile(reader)
 	return proxy.WithPatterns(patterns)
 }
 
+func EvalDevicesOpts(cfg *config.Config) (proxy.ProxyOption) {
+	deviceFile, _ := cfg.String("device-file")
+	reader, err := os.Open(deviceFile)
+	defer reader.Close()
+	devices := []string{}
+	if err != nil {
+		return proxy.WithPatterns(proxy.DEVICES)
+	}
+	devices, err  = proxy.ReadLineFile(reader)
+	if err != nil {
+		log.Printf("Error while reading device file: %s", err.Error())
+	}
+	return proxy.WithDevMappings(devices)
+}
+
 func EvalBindMountOpts(cfg *config.Config) (proxy.ProxyOption) {
 	bindStr, _ := cfg.String("add-binds")
 	bindMounts := strings.Split(bindStr,",")
@@ -106,6 +127,7 @@ func RunApp(ctx *cli.Context) {
 	cfg := config.NewConfig([]config.Provider{config.NewCLI(ctx, true)})
 	po := EvalOptions(cfg)
 	po = append(po, EvalPatternOpts(cfg))
+	po = append(po, EvalDevicesOpts(cfg))
 	po = append(po, EvalBindMountOpts(cfg))
 	p := proxy.NewProxy(po...)
 	p.Run()
@@ -121,6 +143,7 @@ func main() {
 		proxySocketFlag,
 		debugFlag,
 		gpuEnabled,
+		deviceFileFlag,
 		patternFileFlag,
 		proxyPatternKey,
 		bindAddFlag,

proxy/main.go

@@ -13,6 +13,7 @@ const (
 	DOCKER_SOCKET = "/var/run/docker.sock"
 	PROXY_SOCKET = "/tmp/doxy.sock"
 	PATTERN_FILE = "/etc/doxy.pattern"
+	DEVICE_FILE = "/etc/doxy.devices"
 )
 
 var (
@@ -29,15 +30,17 @@ var (
 	}
 	HPC_PAT = []string{
 		`^/(v\d\.\d+/)?containers(/\w+)?/(json|stats|top|create|start|run|kill)$`,
-		`^/(v\d\.\d+/)?services(/[0-9a-f]+)?$`,
-		`^/(v\d\.\d+/)?tasks(/\w+)?$`,
-		`^/(v\d\.\d+/)?networks(/\w+)?$`,
-		`^/(v\d\.\d+/)?volumes(/\w+)?$`,
-		`^/(v\d\.\d+/)?nodes(/\w+)?$`,
+		`^/(v\d\.\d+/)?images(/\w+)?/(json|pull)$`,
 		`^/(v\d\.\d+/)?info$`,
+		`^/(v\d\.\d+/)?images(/\w+)?/(pull)$`,
 		`^/(v\d\.\d+/)?version$`,
 		"^/_ping$",
 	}
+	DEVICES = []string{
+		"/dev/nvidia0:/dev/nvidia0:rwm",
+		"/dev/nvidia-uvm:/dev/nvidia-uvm:rwm",
+		"/dev/nvidiactl:/dev/nvidiactl:rwm",
+	}
 	PATTERNS = map[string][]string{
 		"default": DEF_PAT,
 		"hpc": HPC_PAT,

proxy/patterns.go

@@ -6,7 +6,7 @@ import (
 	"io"
 )
 
-func ReadPatterns(reader io.Reader) (patterns []string, err error) {
+func ReadLineFile(reader io.Reader) (patterns []string, err error) {
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
 		line := scanner.Text()

proxy/proxy.go

@@ -121,12 +121,9 @@ func (u *UpStream) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		if u.gpu {
 			fmt.Println("Add GPU stuff")
 			// TODO: Be smarter about the version of the driver
-			hostConfig.Binds = append(hostConfig.Binds, "/var/lib/nvidia-docker/volumes/nvidia_driver/384.81/:/usr/local/nvidia/")
-			devMappings = append(devMappings, "/dev/nvidia0:/dev/nvidia0:rwm")
-			devMappings = append(devMappings, "/dev/nvidia-uvm:/dev/nvidia-uvm:rwm")
-			devMappings = append(devMappings, "/dev/nvidia-uvm-tools:/dev/nvidia-uvm-tools:rwm")
-			devMappings = append(devMappings, "/dev/nvidiactl:/dev/nvidiactl:rwm")
+			hostConfig.Binds = append(hostConfig.Binds, "/usr/lib/nvidia-384/:/usr/local/nvidia/")
 			config.Env = append(config.Env, "PATH=/usr/local/nvidia/bin:/usr/local/cuda/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin")
+			config.Env = append(config.Env, "LD_LIBRARY_PATH=/usr/local/nvidia/")
 		}
 		for _, bMount := range u.bindMounts {
 			if bMount == "" {