feat: update Dockerfile and Makefile for CUDA 12.6.3 support and adjust image names

haitwang-cloud · haitwang-cloud · commit b0542124d86d · 2025-02-26T16:27:38.000+08:00
diff --git a/Makefile b/Makefile
@@ -7,10 +7,10 @@ docker:
 	docker build \
 	--build-arg GOLANG_IMAGE=${GOLANG_IMAGE} \
 	--build-arg TARGET_ARCH=${TARGET_ARCH} \
+	--build-arg NVIDIA_DEVEL_IMAGE=${NVIDIA_DEVEL_IMAGE} \
 	--build-arg NVIDIA_IMAGE=${NVIDIA_IMAGE} \
 	--build-arg DEST_DIR=${DEST_DIR} \
 	--build-arg VERSION=${VERSION} \
-	--build-arg GOPROXY=https://goproxy.cn,direct \
 	. -f=docker/Dockerfile -t ${IMG_TAG}
 
 dockerwithlib:
diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -1,5 +1,6 @@
-ARG GOLANG_IMAGE=golang:1.22.5-bullseye
-ARG NVIDIA_IMAGE=nvidia/cuda:12.2.0-devel-ubuntu20.04
+ARG GOLANG_IMAGE
+ARG NVIDIA_IMAGE
+ARG NVIDIA_DEVEL_IMAGE
 
 FROM $GOLANG_IMAGE AS build
 FROM $GOLANG_IMAGE AS gobuild
@@ -11,14 +12,14 @@ ADD . /k8s-vgpu
 RUN cd /k8s-vgpu && make all VERSION=$VERSION
 RUN go install github.com/NVIDIA/mig-parted/cmd/nvidia-mig-parted@v0.10.0
 
-FROM $NVIDIA_IMAGE AS nvbuild
+FROM $NVIDIA_DEVEL_IMAGE AS nvbuild
 COPY ./libvgpu /libvgpu
 WORKDIR /libvgpu
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt-get -y update; apt-get -y install cmake
 RUN bash ./build.sh
 
-FROM nvidia/cuda:12.6.3-base-ubuntu22.04
+FROM $NVIDIA_IMAGE
 ENV NVIDIA_DISABLE_REQUIRE="true"
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
diff --git a/pkg/nvidia-plugin/api/config/v1/config.go b/pkg/nvidia-plugin/api/config/v1/config.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/consts.go b/pkg/nvidia-plugin/api/config/v1/consts.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/duration.go b/pkg/nvidia-plugin/api/config/v1/duration.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/flags.go b/pkg/nvidia-plugin/api/config/v1/flags.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/flags_test.go b/pkg/nvidia-plugin/api/config/v1/flags_test.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/replicas.go b/pkg/nvidia-plugin/api/config/v1/replicas.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/replicas_test.go b/pkg/nvidia-plugin/api/config/v1/replicas_test.go
@@ -1,17 +1,33 @@
 /*
- * Copyright (c) 2022, NVIDIA CORPORATION.  All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+* SPDX-License-Identifier: Apache-2.0
+*
+* The HAMi Contributors require contributions made to
+* this file be licensed under the Apache-2.0 license or a
+* compatible open source license.
+ */
+
+/*
+* Licensed to NVIDIA CORPORATION under one or more contributor
+* license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright
+* ownership. NVIDIA CORPORATION licenses this file to you under
+* the Apache License, Version 2.0 (the "License"); you may
+* not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing,
+* software distributed under the License is distributed on an
+* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+* KIND, either express or implied.  See the License for the
+* specific language governing permissions and limitations
+* under the License.
+ */
+
+/*
+* Modifications Copyright The HAMi Authors. See
+* GitHub history for details.
  */
 
 package v1
diff --git a/pkg/nvidia-plugin/api/config/v1/resources.go b/pkg/nvidia-plugin/api/config/v1/resources.go
diff --git a/pkg/nvidia-plugin/api/config/v1/sharing.go b/pkg/nvidia-plugin/api/config/v1/sharing.go
diff --git a/pkg/nvidia-plugin/pkg/cuda/result.go b/pkg/nvidia-plugin/pkg/cuda/result.go
diff --git a/version.mk b/version.mk
