explicitly define usrLibMultiarchDir on supported platforms via build constraints

Author: johnstcn

dockerutil/image.go

@@ -6,7 +6,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	goruntime "runtime"
 	"strings"
 	"time"
 
@@ -24,16 +23,11 @@ import (
 
 const diskFullStorageDriver = "vfs"
 
-var usrLibMultiarchDir = map[string]string{
-	"arm64": "/usr/lib/aarch64-linux-gnu",
-	"amd64": "/usr/lib/x86_64-linux-gnu",
-}
-
 // Adapted from https://github.com/NVIDIA/libnvidia-container/blob/v1.15.0/src/nvc_container.c#L152-L165
 var UsrLibDirs = map[string]string{
 	// Debian-based distros use a multi-arch directory.
-	"debian": usrLibMultiarchDir[goruntime.GOARCH],
-	"ubuntu": usrLibMultiarchDir[goruntime.GOARCH],
+	"debian": usrLibMultiarchDir,
+	"ubuntu": usrLibMultiarchDir,
 	// Fedora and Redhat use the standard /usr/lib64.
 	"fedora": "/usr/lib64",
 	"rhel":   "/usr/lib64",

dockerutil/image_linux_amd64.go

@@ -0,0 +1,5 @@
+package dockerutil
+
+// usrLibMultiarchDir is defined for arm64 and amd64 architectures.
+// Envbox is not published for other architectures.
+var usrLibMultiarchDir = "/usr/lib/aarch64-linux-gnu"

dockerutil/image_linux_arm64.go

@@ -0,0 +1,5 @@
+package dockerutil
+
+// usrLibMultiarchDir is defined for arm64 and amd64 architectures.
+// Envbox is not published for other architectures.
+var usrLibMultiarchDir = "/usr/lib/x86_64-linux-gnu"