Fix plugin config and NIC prefix

.gitignore

@@ -0,0 +1 @@
+docker-sriov-plugin

Dockerfile

@@ -1,19 +1,14 @@
-FROM golang:1.10.1 as build
+FROM golang:1.22.2 as build
 WORKDIR /go/src/docker-sriov-plugin
 
-RUN go get github.com/docker/docker/client
-RUN go get github.com/docker/docker/api/types
-
-RUN go get github.com/golang/dep/cmd/dep
-COPY Gopkg.toml Gopkg.lock ./
-RUN dep ensure -v -vendor-only
-
 COPY . .
 RUN export CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' && \
     go install -ldflags="-s -w" -v docker-sriov-plugin
 
-FROM debian:stretch-slim
+FROM debian:bookworm-slim
+ARG PLUGIN_ARGS=
 COPY --from=build /go/bin/docker-sriov-plugin /bin/docker-sriov-plugin
 COPY ibdev2netdev /tmp/tools/
-
-CMD ["/bin/docker-sriov-plugin"]
+RUN echo "$PLUGIN_ARGS" > /tmp/plugin_args
+COPY run_docker_sriov_plugin /bin
+CMD ["/bin/run_docker_sriov_plugin"]

Dockerfile-dev

@@ -0,0 +1,7 @@
+FROM debian:bookworm-slim
+ARG PLUGIN_ARGS
+COPY docker-sriov-plugin /bin/
+COPY ibdev2netdev /tmp/tools/
+RUN echo "--debug $PLUGIN_ARGS" > /tmp/plugin_args
+COPY run_docker_sriov_plugin /bin
+CMD ["/bin/run_docker_sriov_plugin"]

build

@@ -50,8 +50,9 @@ function execute_cmd()
 {
 	case "$input_cmd" in
 	"make")
-		echo "Building image: $ARCH_IMAGE"
-		docker build . --force-rm -t $ARCH_IMAGE
+		 echo "Building image: $ARCH_IMAGE"
+       set -x
+		docker build . --force-rm -t $ARCH_IMAGE $@
 	;;
 	"push")
 		echo "Pushing images"
@@ -80,7 +81,8 @@ validate_input_cmd $1
 if [ $# -lt 1 ]; then
 	input_cmd=make
 else
-	input_cmd=$1
+	 input_cmd=$1
+    shift
 fi
 
-execute_cmd
+execute_cmd $@

build_dev

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+CGO_LDFLAGS_ALLOW='-Wl,--unresolved-symbols=ignore-in-object-files' \
+    go build -ldflags="-s -w" -v docker-sriov-plugin || exit 1
+
+exec docker build --progress plain --force-rm -t rdma/sriov-plugin:dev -f Dockerfile-dev .

driver/client.go

@@ -9,7 +9,7 @@ import (
 
 func getRightClientApiVersion() (string, error) {
 	// Start with the lowest API to query which version is supported.
-	lowestCli, err3 := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.12"))
+	lowestCli, err3 := client.NewClientWithOpts(client.FromEnv, client.WithVersion("1.24"))
 	if err3 != nil {
 		fmt.Println("Fail to create client: ", err3)
 		return "", err3