changes docker

BigNoobWasTaken · BigNoobWasTaken · commit ff31154d7418 · 2025-08-05T04:47:40.000Z
diff --git a/Dockerfolder/CUDA-12.9.1-Ubuntu-20.04.Dockerfile b/Dockerfolder/CUDA-12.9.1-Ubuntu-20.04.Dockerfile
@@ -7,12 +7,12 @@ RUN apt-get install curl -y
 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.27.9"
 
 # Optionally install the cmake for vcpkg
-COPY scripts/packages-install/reinstall-cmake.sh /tmp/
+COPY scripts/packages-install/reinstall-cmake-ubuntu.sh /tmp/
 
 RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
-        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake-ubuntu.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
     fi \
-    && rm -f /tmp/reinstall-cmake.sh
+    && rm -f /tmp/reinstall-cmake-ubuntu.sh
 
 
 # [Optional] Uncomment this section to install additional vcpkg ports.
diff --git a/Dockerfolder/CUDA-12.9.1-ubi8.Dockerfile b/Dockerfolder/CUDA-12.9.1-ubi8.Dockerfile
@@ -1,18 +1,18 @@
 FROM nvcr.io/nvidia/cuda:12.9.1-devel-ubi8
 
-RUN apt-get update
-RUN apt-get upgrade -y
-RUN apt-get install curl -y
+RUN dnf update
+RUN dnf upgrade -y
+RUN dnf install curl -y
 
 ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.27.9"
 
 # Optionally install the cmake for vcpkg
-COPY scripts/packages-install/reinstall-cmake.sh /tmp/
+COPY scripts/packages-install/reinstall-cmake-rhel.sh /tmp/
 
 RUN if [ "${REINSTALL_CMAKE_VERSION_FROM_SOURCE}" != "none" ]; then \
-        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
+        chmod +x /tmp/reinstall-cmake.sh && /tmp/reinstall-cmake-rhel.sh ${REINSTALL_CMAKE_VERSION_FROM_SOURCE}; \
     fi \
-    && rm -f /tmp/reinstall-cmake.sh
+    && rm -f /tmp/reinstall-cmake-rhel.sh
 
 
 # [Optional] Uncomment this section to install additional vcpkg ports.
diff --git a/scripts/packages-install/reinstall-cmake-rhel.sh b/scripts/packages-install/reinstall-cmake-rhel.sh
@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#-------------------------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See https://go.microsoft.com/fwlink/?linkid=2090316 for license information.
+#-------------------------------------------------------------------------------------------------------------
+#
+set -e
+
+CMAKE_VERSION=${1:-"none"}
+
+if [ "${CMAKE_VERSION}" = "none" ]; then
+    echo "No CMake version specified, skipping CMake reinstallation"
+    exit 0
+fi
+
+# Cleanup temporary directory and associated files when exiting the script.
+cleanup() {
+    EXIT_CODE=$?
+    set +e
+    if [[ -n "${TMP_DIR}" ]]; then
+        echo "Executing cleanup of tmp files"
+        rm -Rf "${TMP_DIR}"
+    fi
+    exit $EXIT_CODE
+}
+trap cleanup EXIT
+
+
+echo "Installing CMake..."
+dnf -y autoremove cmake
+mkdir -p /opt/cmake
+
+architecture=$(dpkg --print-architecture)
+case "${architecture}" in
+    arm64)
+        ARCH=aarch64 ;;
+    amd64)
+        ARCH=x86_64 ;;
+    *)
+        echo "Unsupported architecture ${architecture}."
+        exit 1
+        ;;
+esac
+
+CMAKE_BINARY_NAME="cmake-${CMAKE_VERSION}-linux-${ARCH}.sh"
+CMAKE_CHECKSUM_NAME="cmake-${CMAKE_VERSION}-SHA-256.txt"
+TMP_DIR=$(mktemp -d -t cmake-XXXXXXXXXX)
+
+echo "${TMP_DIR}"
+cd "${TMP_DIR}"
+
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_BINARY_NAME}" -O
+curl -sSL "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${CMAKE_CHECKSUM_NAME}" -O
+
+sha256sum -c --ignore-missing "${CMAKE_CHECKSUM_NAME}"
+sh "${TMP_DIR}/${CMAKE_BINARY_NAME}" --prefix=/opt/cmake --skip-license
+
+ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+ln -s /opt/cmake/bin/ctest /usr/local/bin/ctest
diff --git a/scripts/packages-install/reinstall-cmake-ubuntu.sh b/scripts/packages-install/reinstall-cmake-ubuntu.sh
