Skip to content

Commit d42a588

Browse files
Merge pull request #23 from Mellanox/network-operator-25.10.x
Network operator 25.10.x
2 parents 5f678b4 + 8b55766 commit d42a588

File tree

2 files changed

+17
-4
lines changed

2 files changed

+17
-4
lines changed

.github/workflows/fork-ci.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,4 @@ jobs:
3030
registry-username: ${{ secrets.NVCR_USERNAME }}
3131
registry-token: ${{ secrets.NVCR_TOKEN }}
3232
cicd-gh-token: ${{ secrets.GH_TOKEN_NVIDIA_CI_CD }}
33+
goproxy: ${{ secrets.GO_PROXY_URL }}

images/Dockerfile.nvidia

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@
1313
# limitations under the License.
1414

1515
FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder
16+
17+
ARG GOPROXY
18+
ENV GOPROXY=$GOPROXY
19+
1620
ARG TARGETPLATFORM
1721
ARG TARGETARCH
1822
ARG TARGETVARIANT
@@ -28,17 +32,25 @@ RUN apt-get update && \
2832
GOOS=linux GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT} make clean && \
2933
GOOS=linux GOARCH=${TARGETARCH} GOARM=${TARGETVARIANT} make build
3034

31-
FROM nvcr.io/nvidia/doca/doca:3.0.0-base-rt-host
35+
FROM alpine:3 AS pkgs
36+
RUN apk add --no-cache hwdata-pci kmod
37+
38+
FROM nvcr.io/nvidia/distroless/go:v3.1.12-dev
39+
40+
USER 0:0
41+
SHELL ["/busybox/sh", "-c"]
42+
RUN ln -s /busybox/sh /bin/sh
3243

3344
ARG TARGETPLATFORM
3445
ARG TARGETARCH
3546
ARG TARGETVARIANT
3647

3748
COPY --from=builder /usr/src/sriov-network-device-plugin/build/sriovdp /usr/bin/
38-
WORKDIR /
49+
RUN mkdir -p /usr/share/hwdata
50+
COPY --from=pkgs /usr/share/hwdata/pci.ids /usr/share/hwdata/pci.ids
51+
COPY --from=pkgs /sbin/lsmod /sbin/lsmod
3952

40-
RUN apt-get update && apt-get install -y --no-install-recommends kmod=29-1ubuntu1 && \
41-
rm -rf /var/lib/apt/lists/*
53+
WORKDIR /
4254

4355
COPY --from=builder /usr/src/sriov-network-device-plugin ./src
4456

0 commit comments

Comments
 (0)