Skip to content

Commit 6bde484

Browse files
elezarArangoGutierrez
authored andcommitted
Merge pull request NVIDIA#1214 from NVIDIA/dependabot/docker/deployments/container/main/nvidia/distroless/go-v3.1.11-dev
Bump nvidia/distroless/go from v3.1.10-dev to v3.1.11-dev in /deployments/container
2 parents 4f98c01 + e450e85 commit 6bde484

File tree

2 files changed

+34
-2
lines changed

2 files changed

+34
-2
lines changed

deployments/container/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ RUN make PREFIX=/artifacts/bin cmd-nvidia-ctk-installer
5252

5353
# The packaging stage collects the deb and rpm packages built for
5454
# supported architectures.
55-
FROM nvcr.io/nvidia/distroless/go:v3.1.10-dev AS packaging
55+
FROM nvcr.io/nvidia/distroless/go:v3.1.11-dev AS packaging
5656

5757
USER 0:0
5858
SHELL ["/busybox/sh", "-c"]
@@ -142,7 +142,7 @@ COPY --from=build /artifacts/bin /artifacts/build
142142

143143
# The application stage contains the application used as a GPU Operator
144144
# operand.
145-
FROM nvcr.io/nvidia/distroless/go:v3.1.10-dev AS application
145+
FROM nvcr.io/nvidia/distroless/go:v3.1.11-dev AS application
146146

147147
USER 0:0
148148
SHELL ["/busybox/sh", "-c"]

pkg/nvcdi/driver-nvml.go

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,38 @@ func getVersionLibs(logger logger.Interface, driver *root.Driver, version string
235235
return nil, "", fmt.Errorf("failed to locate libraries for driver version %v: %v", version, err)
236236
}
237237

238+
// List of explicit libraries to locate
239+
// TODO(ArangoGutierrez): we should load the version of the libraries from
240+
// the sandboxutils-filelist.
241+
explicitLibraryNames := []string{
242+
"libEGL.so.1.1.0",
243+
"libGL.so.1.7.0",
244+
"libGLESv1_CM.so.1.2.0",
245+
"libGLESv2.so.2.1.0",
246+
"libGLX.so.0",
247+
"libGLdispatch.so.0",
248+
"libOpenCL.so.1.0.0",
249+
"libOpenGL.so.0",
250+
"libnvidia-api.so.1",
251+
"libnvidia-egl-xcb.so.1.0.0",
252+
"libnvidia-egl-xlib.so.1.0.0",
253+
}
254+
255+
// Locate each explicit library
256+
var explicitLibs []string
257+
for _, libName := range explicitLibraryNames {
258+
found, err := libraries.Locate(libName)
259+
if err != nil {
260+
// Log warning but continue with other libraries
261+
logger.Warningf("failed to locate library %s: %v", libName, err)
262+
continue
263+
}
264+
explicitLibs = append(explicitLibs, found...)
265+
}
266+
267+
// Append explicit libraries to the main libs list
268+
libs = append(libs, explicitLibs...)
269+
238270
if driver.Root == "/" || driver.Root == "" {
239271
return libs, libCudaDirectoryPath, nil
240272
}

0 commit comments

Comments
 (0)