From f52026884cbf909da8aa09f882313879d8d80632 Mon Sep 17 00:00:00 2001 From: Douglas Wightman Date: Wed, 3 Apr 2024 20:09:59 +0000 Subject: [PATCH] Fixes for building on arm64 --- docker/Dockerfile.ubi9 | 2 +- docker/Dockerfile.ubuntu22.04 | 2 +- pkg/stdout/capture.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.ubi9 b/docker/Dockerfile.ubi9 index d0bc16f4..feeafb31 100644 --- a/docker/Dockerfile.ubi9 +++ b/docker/Dockerfile.ubi9 @@ -40,7 +40,7 @@ COPY . . RUN make binary check-format -FROM nvcr.io/nvidia/cuda:12.3.1-base-ubi9 +FROM nvcr.io/nvidia/cuda:12.3.2-base-ubi9 LABEL io.k8s.display-name="NVIDIA DCGM Exporter" ARG DCGM_VERSION diff --git a/docker/Dockerfile.ubuntu22.04 b/docker/Dockerfile.ubuntu22.04 index 74e1d4e8..8547d3df 100644 --- a/docker/Dockerfile.ubuntu22.04 +++ b/docker/Dockerfile.ubuntu22.04 @@ -45,7 +45,7 @@ COPY . . RUN make binary check-format -FROM nvcr.io/nvidia/cuda:12.3.1-base-ubuntu22.04 +FROM nvcr.io/nvidia/cuda:12.3.2-base-ubuntu22.04 LABEL io.k8s.display-name="NVIDIA DCGM Exporter" COPY --from=builder /go/src/github.com/NVIDIA/dcgm-exporter/cmd/dcgm-exporter/dcgm-exporter /usr/bin/ diff --git a/pkg/stdout/capture.go b/pkg/stdout/capture.go index 8e0b8257..d1854911 100644 --- a/pkg/stdout/capture.go +++ b/pkg/stdout/capture.go @@ -37,7 +37,7 @@ func Capture(ctx context.Context, inner func() error) error { return err } - err = syscall.Dup2(int(w.Fd()), syscall.Stdout) + err = syscall.Dup3(int(w.Fd()), syscall.Stdout, 0) if err != nil { return err } @@ -48,7 +48,7 @@ func Capture(ctx context.Context, inner func() error) error { err = ierr } - ierr = syscall.Dup2(stdout, syscall.Stdout) + ierr = syscall.Dup3(stdout, syscall.Stdout, 0) if ierr != nil { err = ierr }