switch to nvcr.io registry and update from ubi8 to ubi9

Signed-off-by: Tariq Ibrahim <tibrahim@nvidia.com>
NVIDIA · Oct 29, 2024 · 3709b48 · 3709b48
1 parent 8d9c72b
commit 3709b48
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 26 deletions.
diff --git a/.common-ci.yml b/.common-ci.yml
@@ -43,9 +43,9 @@ stages:
   variables:
     DIST: ubuntu22.04
 
-.dist-ubi8:
+.dist-ubi9:
   variables:
-    DIST: ubi8
+    DIST: ubi9
 
 # Define the platform targets
 .platform-amd64:
@@ -154,13 +154,13 @@ stages:
         OUT_IMAGE_VERSION: "${DEVEL_RELEASE_IMAGE_VERSION}"
 
 # Define the release jobs
-release:staging-vectoradd-ubi8:
+release:staging-vectoradd-ubi9:
   extends:
     - .release:staging
-    - .dist-ubi8
+    - .dist-ubi9
     - .sample-vectoradd
   needs:
-    - image-vectoradd-ubi8
+    - image-vectoradd-ubi9
 
 release:staging-vectoradd-ubuntu22.04:
   extends:

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
@@ -35,15 +35,15 @@ jobs:
       matrix:
         dist:
         - ubuntu22.04
-        - ubi8
+        - ubi9
         sample:
         - vectorAdd
         - nbody
         - deviceQuery
         exclude:
-        - dist: ubi8
+        - dist: ubi9
           sample: deviceQuery
-        - dist: ubi8
+        - dist: ubi9
           sample: nbody
 
     steps:

diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
@@ -72,10 +72,10 @@ image-vectoradd-ubuntu22.04:
     - .dist-ubuntu22.04
     - .sample-vectoradd
 
-image-vectoradd-ubi8:
+image-vectoradd-ubi9:
   extends:
     - .image-pull
-    - .dist-ubi8
+    - .dist-ubi9
     - .sample-vectoradd
 
 image-device-query-ubuntu22.04:
@@ -160,24 +160,24 @@ scan-device-query-ubuntu22.04-arm64:
     - image-device-query-ubuntu22.04
     - scan-device-query-ubuntu22.04-amd64
 
-scan-vectoradd-ubi8-amd64:
+scan-vectoradd-ubi9-amd64:
   extends:
     - .scan
     - .sample-vectoradd
-    - .dist-ubi8
+    - .dist-ubi9
     - .platform-amd64
   needs:
-    - image-vectoradd-ubi8
+    - image-vectoradd-ubi9
 
-scan-vectoradd-ubi8-arm64:
+scan-vectoradd-ubi9-arm64:
   extends:
     - .scan
     - .sample-vectoradd
-    - .dist-ubi8
+    - .dist-ubi9
     - .platform-arm64
   needs:
-    - image-vectoradd-ubi8
-    - scan-vectoradd-ubi8-amd64
+    - image-vectoradd-ubi9
+    - scan-vectoradd-ubi9-amd64
 
 scan-nbody-ubuntu22.04-amd64:
   extends:
@@ -222,10 +222,10 @@ release:ngc-device-query-ubuntu22.04:
     - .dist-ubuntu22.04
     - .sample-device-query
 
-release:ngc-vectoradd-ubi8:
+release:ngc-vectoradd-ubi9:
   extends:
     - .release:ngc
-    - .dist-ubi8
+    - .dist-ubi9
     - .sample-vectoradd
 
 release:ngc-nbody-ubuntu22.04:

diff --git a/deployments/container/Dockerfile.ubi8 → deployments/container/Dockerfile.ubi9 b/deployments/container/Dockerfile.ubi8 → deployments/container/Dockerfile.ubi9
@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvidia/cuda:12.6.2-devel-ubi8 AS builder
+FROM nvcr.io/nvidia/cuda:12.6.2-devel-ubi9 AS builder
 
 ARG CUDA_VERSION
-RUN dnf install -y  \
+RUN dnf install -y --allowerasing  \
         curl \
     && \
     dnf clean all
@@ -31,7 +31,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C
     make build && \
     cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
 
-FROM nvidia/cuda:12.6.2-base-ubi8
+FROM nvcr.io/nvidia/cuda:12.6.2-base-ubi9
 ARG SAMPLE_NAME
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"

diff --git a/deployments/container/Dockerfile.ubuntu b/deployments/container/Dockerfile.ubuntu
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM nvidia/cuda:12.6.2-devel-ubuntu22.04 AS builder
+FROM nvcr.io/nvidia/cuda:12.6.2-devel-ubuntu22.04 AS builder
 
 ARG SAMPLE_NAME
 ENV SAMPLE_NAME ${SAMPLE_NAME}
@@ -41,7 +41,7 @@ RUN curl -L https://codeload.github.com/NVIDIA/cuda-samples/tar.gz/refs/tags/${C
     make build && \
     cp $(find /build/bin -iname "${SAMPLE_NAME}") /build/${SAMPLE_NAME}
 
-FROM nvidia/cuda:12.6.2-base-ubuntu22.04
+FROM nvcr.io/nvidia/cuda:12.6.2-base-ubuntu22.04
 ARG SAMPLE_NAME
 LABEL io.k8s.display-name="NVIDIA CUDA ${SAMPLE_NAME} sample"
 LABEL name="NVIDIA CUDA ${SAMPLE_NAME} sample"

diff --git a/deployments/container/Makefile b/deployments/container/Makefile
@@ -45,7 +45,7 @@ OUT_IMAGE_TAG ?= $(LOWER_CASE_SAMPLE)-$(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 DEFAULT_PUSH_TARGET := ubuntu22.04
-DISTRIBUTIONS := ubuntu22.04 ubi8
+DISTRIBUTIONS := ubuntu22.04 ubi9
 
 BUILD_TARGETS := $(patsubst %,build-%, $(DISTRIBUTIONS))
 PUSH_TARGETS := $(patsubst %,push-%, $(DISTRIBUTIONS))
@@ -84,7 +84,7 @@ build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SU
 
 build-ubuntu%: DOCKERFILE_SUFFIX = ubuntu
 
-build-ubi8: DOCKERFILE_SUFFIX = ubi8
+build-ubi9: DOCKERFILE_SUFFIX = ubi9
 
 # Use a generic build target to build the relevant images
 $(BUILD_TARGETS): build-%: