Update container images to use latest

Update CUDA base image from version to 12.6.3 for both builder and runtime stages. Update UBI base image to 9.5. Update ROCm version in to 6.3.1. Signed-off-by: Eric Curtin <[email protected]>
containers · Jan 5, 2025 · c508393 · c508393
1 parent 4a6ac32
commit c508393
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/container-images/cuda/Containerfile b/container-images/cuda/Containerfile
@@ -1,5 +1,5 @@
 # Base image with CUDA for compilation
-FROM docker.io/nvidia/cuda:12.6.2-devel-ubi9 AS builder
+FROM docker.io/nvidia/cuda:12.6.3-devel-ubi9 AS builder
 
 ARG LLAMA_CPP_SHA=0827b2c1da299805288abbd556d869318f2b121e
 # renovate: datasource=git-refs depName=ggerganov/whisper.cpp packageName=https://github.com/ggerganov/whisper.cpp gitRef=master versioning=loose type=digest
@@ -11,7 +11,7 @@ RUN chmod +x /scripts/*.sh && \
       "$WHISPER_CPP_SHA"
 
 # Final runtime image
-FROM docker.io/nvidia/cuda:12.6.2-runtime-ubi9
+FROM docker.io/nvidia/cuda:12.6.3-runtime-ubi9
 
 RUN dnf install -y python3 && \
     dnf clean all && rm -rf /var/cache/*dnf*

diff --git a/container-images/ramalama/Containerfile b/container-images/ramalama/Containerfile
@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi9/ubi:9.4-1214.1729773476
+FROM registry.access.redhat.com/ubi9/ubi:9.5
 
 ARG LLAMA_CPP_SHA=0827b2c1da299805288abbd556d869318f2b121e
 # renovate: datasource=git-refs depName=ggerganov/whisper.cpp packageName=https://github.com/ggerganov/whisper.cpp gitRef=master versioning=loose type=digest

diff --git a/container-images/rocm/Containerfile b/container-images/rocm/Containerfile
@@ -1,8 +1,5 @@
 FROM quay.io/ramalama/ramalama:latest
 
-ARG ROCM_VERSION=6.2.2
-ARG AMDGPU_VERSION=6.2.2
-
 COPY rocm/amdgpu.repo /etc/yum.repos.d/
 COPY rocm/rocm.repo /etc/yum.repos.d/
 COPY scripts /scripts

diff --git a/container-images/rocm/amdgpu.repo b/container-images/rocm/amdgpu.repo
@@ -1,6 +1,6 @@
 [amdgpu]
 name=amdgpu
-baseurl=https://repo.radeon.com/amdgpu/6.2.2/rhel/9.4/main/x86_64/
+baseurl=https://repo.radeon.com/amdgpu/6.3.1/rhel/9.5/main/x86_64/
 enabled=1
 priority=50
 gpgcheck=1

diff --git a/container-images/rocm/rocm.repo b/container-images/rocm/rocm.repo
@@ -1,6 +1,6 @@
 [ROCm]
 name=ROCm
-baseurl=https://repo.radeon.com/rocm/rhel9/6.2.2/main
+baseurl=https://repo.radeon.com/rocm/rhel9/6.3.1/main
 enabled=1
 priority=50
 gpgcheck=1

diff --git a/container_build.sh b/container_build.sh
@@ -25,7 +25,7 @@ add_build_platform() {
 }
 
 rm_container_image() {
-  if [ "$image_name" == "cuda" ] || [ "$image_name" == "rocm" ]; then
+  if "$rm_after_build"; then
     "$conman_bin" rmi -f "$image_name" || true
   fi
 }
@@ -81,6 +81,10 @@ parse_arguments() {
         option="$1"
         shift
         ;;
+      -r)
+        rm_after_build="true"
+        shift
+        ;;
       build|push)
         command="$1"
         shift
@@ -113,6 +117,7 @@ print_usage() {
   echo
   echo "Options:"
   echo "  -d           Some option description"
+  echo "  -r           Remove container image after build"
   echo
   echo "Targets:"
   echo "  Specify the target container image to build or push"
@@ -129,6 +134,7 @@ main() {
   local target=""
   local command=""
   local option=""
+  local rm_after_build="false"
 
   parse_arguments "$@"