Use only ubi9 image

This change switches to only using a ubi9 image to align with
other projects.

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

.github/workflows/image.yaml

@@ -31,9 +31,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        dist: [ubuntu20.04, ubi8]
     steps:
       - uses: actions/checkout@v4
         name: Check out code
@@ -72,4 +69,4 @@ jobs:
           VERSION: ${COMMIT_SHORT_SHA}
         run: |
           echo "${VERSION}"
-          make -f deployments/container/Makefile build-${{ matrix.dist }}
+          make -f deployments/container/Makefile build

deployments/container/Dockerfile.ubi8 renamed to deployments/container/Dockerfile

@@ -13,19 +13,15 @@
 # limitations under the License.
 
 ARG GOLANG_VERSION=1.23.1
-ARG CUDA_IMAGE=cuda
-ARG CUDA_VERSION=11.8.0
-ARG BASE_DIST=ubi8
-FROM --platform=${TARGETARCH} nvcr.io/nvidia/cuda:${CUDA_VERSION}-base-${BASE_DIST} as build
+FROM --platform=${BUILDOS}/amd64 nvcr.io/nvidia/cuda:12.3.2-base-ubi9 AS build
 
 RUN yum install -y \
-    wget make git gcc \
+    wget make git gcc-aarch64-linux-gnu gcc \
      && \
     rm -rf /var/cache/yum/*
 
-ARG TARGETARCH
 ARG GOLANG_VERSION=x.x.x
-RUN wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-${TARGETARCH}.tar.gz \
+RUN wget -nv -O - https://storage.googleapis.com/golang/go${GOLANG_VERSION}.linux-amd64.tar.gz \
     | tar -C /usr/local -xz
 
 ENV GOPATH /go
@@ -37,19 +33,27 @@ COPY . .
 RUN mkdir /artifacts
 ARG VERSION="N/A"
 ARG GIT_COMMIT="unknown"
-RUN make PREFIX=/artifacts cmds
+ARG TARGETARCH
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+        cc=gcc; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+        cc=aarch64-linux-gnu-gcc; \
+    fi && \
+    make CC=${cc} GOARCH=${TARGETARCH} PREFIX=/artifacts cmds
 
-FROM nvcr.io/nvidia/${CUDA_IMAGE}:${CUDA_VERSION}-base-${BASE_DIST}
+
+FROM nvcr.io/nvidia/cuda:12.3.2-base-ubi9
 
 ENV NVIDIA_DISABLE_REQUIRE="true"
 ENV NVIDIA_VISIBLE_DEVICES=all
 ENV NVIDIA_DRIVER_CAPABILITIES=utility
+ARG VERSION="N/A"
+ARG GIT_COMMIT="unknown"
 
 LABEL io.k8s.display-name="NVIDIA DRA Driver"
 LABEL name="NVIDIA DRA Driver"
 LABEL vendor="NVIDIA"
-ARG VERSION="N/A"
-ARG GIT_COMMIT="unknown"
 LABEL version=${VERSION}
 LABEL com.nvidia.git-commit="${GIT_COMMIT}"
 LABEL release="N/A"
@@ -62,10 +66,3 @@ RUN mkdir /licenses && mv /NGC-DL-CONTAINER-LICENSE /licenses/NGC-DL-CONTAINER-L
 COPY --from=build /artifacts/nvidia-dra-controller /usr/bin/nvidia-dra-controller
 COPY --from=build /artifacts/nvidia-dra-plugin     /usr/bin/nvidia-dra-plugin
 COPY --from=build /build/templates                 /templates
-
-# Install / upgrade packages here that are required to resolve CVEs
-ARG CVE_UPDATES
-RUN if [ -n "${CVE_UPDATES}" ]; then \
-        yum update -y ${CVE_UPDATES} && \
-        rm -rf /var/cache/yum/*; \
-    fi

deployments/container/Dockerfile.ubuntu

@@ -38,8 +38,8 @@ OUT_IMAGE_TAG = $(OUT_IMAGE_VERSION)-$(DIST)
 OUT_IMAGE = $(OUT_IMAGE_NAME):$(OUT_IMAGE_TAG)
 
 ##### Public rules #####
-DEFAULT_PUSH_TARGET := ubuntu20.04
-DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET) ubi8
+DEFAULT_PUSH_TARGET := ubi9
+DISTRIBUTIONS = $(DEFAULT_PUSH_TARGET)
 
 IMAGE_TARGETS := $(patsubst %,image-%,$(DISTRIBUTIONS))
 BUILD_TARGETS := $(patsubst %,build-%,$(DISTRIBUTIONS))
@@ -69,28 +69,23 @@ push-%: DIST = $(*)
 push-short: DIST = $(DEFAULT_PUSH_TARGET)
 
 build-%: DIST = $(*)
-build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile.$(DOCKERFILE_SUFFIX)
+build-%: DOCKERFILE = $(CURDIR)/deployments/container/Dockerfile
 
 # Use a generic build target to build the relevant images
 $(IMAGE_TARGETS): image-%:
 	DOCKER_BUILDKIT=1 \
 		$(DOCKER) $(BUILDX) build --pull \
+		--provenance=false --sbom=false \
 		$(DOCKER_BUILD_OPTIONS) \
 		$(DOCKER_BUILD_PLATFORM_OPTIONS) \
 		--tag $(IMAGE) \
-		--build-arg BASE_DIST="$(DIST)" \
-		--build-arg CUDA_VERSION="$(CUDA_VERSION)" \
 		--build-arg GOLANG_VERSION="$(GOLANG_VERSION)" \
 		--build-arg VERSION="$(VERSION)" \
 		--build-arg GIT_COMMIT="$(GIT_COMMIT)" \
 		$(if $(LABEL_IMAGE_SOURCE),--label "org.opencontainers.image.source=$(LABEL_IMAGE_SOURCE)",) \
 		-f $(DOCKERFILE) \
 		$(CURDIR)
 
-build-ubuntu%: DOCKERFILE_SUFFIX := ubuntu
-
-build-ubi8: DOCKERFILE_SUFFIX := ubi8
-
 # Handle the default build target.
 .PHONY: build
 build: $(DEFAULT_PUSH_TARGET)