From 988a79faf740c2119e697f917bcd7a1e20da51bd Mon Sep 17 00:00:00 2001
From: Riley Dixon <riley.dixon@amd.com>
Date: Fri, 14 Nov 2025 09:14:56 -0700
Subject: [PATCH 1/2] CI: Update Dockerfile Labels

---
 util/docker/DOCKERFILE.ais_ci_rocky  | 2 +-
 util/docker/DOCKERFILE.ais_ci_suse   | 2 +-
 util/docker/DOCKERFILE.ais_ci_ubuntu | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/util/docker/DOCKERFILE.ais_ci_rocky b/util/docker/DOCKERFILE.ais_ci_rocky
index 52e12063..3004bf94 100644
--- a/util/docker/DOCKERFILE.ais_ci_rocky
+++ b/util/docker/DOCKERFILE.ais_ci_rocky
@@ -5,7 +5,7 @@
 ARG ROCKY_MAJOR_VERSION=9
 ARG ROCKY_VERSION=${ROCKY_MAJOR_VERSION}.6
 FROM rockylinux/rockylinux:${ROCKY_VERSION}-minimal
-LABEL org.opencontainers.image.source=https://github.com/ROCm/rocs-internal
+LABEL org.opencontainers.image.source=https://github.com/ROCm/hipFile
 # Brings ROCKY_VERSION in-scope
 ARG ROCKY_MAJOR_VERSION
 ARG ROCKY_VERSION
diff --git a/util/docker/DOCKERFILE.ais_ci_suse b/util/docker/DOCKERFILE.ais_ci_suse
index aec6d75b..e1342c7c 100644
--- a/util/docker/DOCKERFILE.ais_ci_suse
+++ b/util/docker/DOCKERFILE.ais_ci_suse
@@ -5,7 +5,7 @@
 ARG SUSE_MAJOR_VERSION=15
 ARG SUSE_VERSION=${SUSE_MAJOR_VERSION}.6
 FROM opensuse/leap:${SUSE_VERSION}
-LABEL org.opencontainers.image.source=https://github.com/ROCm/rocs-internal
+LABEL org.opencontainers.image.source=https://github.com/ROCm/hipFile
 ARG SUSE_MAJOR_VERSION
 ARG SUSE_VERSION
 ARG ROCm_VERSION=6.4.2
diff --git a/util/docker/DOCKERFILE.ais_ci_ubuntu b/util/docker/DOCKERFILE.ais_ci_ubuntu
index 41659b41..fdf38d4a 100644
--- a/util/docker/DOCKERFILE.ais_ci_ubuntu
+++ b/util/docker/DOCKERFILE.ais_ci_ubuntu
@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: MIT
 
 FROM rocm/dev-ubuntu-24.04:6.4.1
-LABEL org.opencontainers.image.source=https://github.com/ROCm/rocs-internal
+LABEL org.opencontainers.image.source=https://github.com/ROCm/hipFile
 
 # CI Dependencies
 RUN apt update && \

From d624972d6b365a534da906a814bb3ffed7246b63 Mon Sep 17 00:00:00 2001
From: Riley Dixon <riley.dixon@amd.com>
Date: Fri, 14 Nov 2025 09:41:29 -0700
Subject: [PATCH 2/2] CI: Change Ubuntu Dockerfile to manually setup ROCm.

---
 util/docker/DOCKERFILE.ais_ci_ubuntu | 41 +++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/util/docker/DOCKERFILE.ais_ci_ubuntu b/util/docker/DOCKERFILE.ais_ci_ubuntu
index fdf38d4a..d7d0523d 100644
--- a/util/docker/DOCKERFILE.ais_ci_ubuntu
+++ b/util/docker/DOCKERFILE.ais_ci_ubuntu
@@ -2,18 +2,44 @@
 #
 # SPDX-License-Identifier: MIT
 
-FROM rocm/dev-ubuntu-24.04:6.4.1
+ARG UBUNTU_CODENAME=noble
+FROM ubuntu:${UBUNTU_CODENAME}
 LABEL org.opencontainers.image.source=https://github.com/ROCm/hipFile
+ARG UBUNTU_CODENAME
+ARG UBUNTU_MAJOR_VERSION=24
+ARG UBUNTU_MINOR_VERSION=04
+ARG ROCm_VERSION=6.4.2
 
-# CI Dependencies
+RUN apt update && \
+    apt install -y \
+        curl \
+        gpg
+
+# Retrieve ROCm GPG key
+RUN curl https://repo.radeon.com/rocm/rocm.gpg.key | \
+    gpg --dearmor >> /etc/apt/keyrings/rocm.gpg
+
+# Manually setup ROCm Package Repos
+RUN cat <<EOF > /etc/apt/sources.list.d/rocm.list
+deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/rocm/apt/${ROCm_VERSION} ${UBUNTU_CODENAME} main
+deb [arch=amd64 signed-by=/etc/apt/keyrings/rocm.gpg] https://repo.radeon.com/amdgpu/${ROCm_VERSION}/ubuntu ${UBUNTU_CODENAME} main
+EOF
+
+RUN cat <<EOF > /etc/apt/preferences.d/rocm-pin-600
+Package: *
+Pin: release o=repo.radeon.com
+Pin-Priority: 600
+EOF
+
+# Development Dependencies
 RUN apt update && \
     apt install -y \
         clang \
         cmake \
-        curl \
         doxygen \
         gdb \
         git \
+        hip-dev \
         libboost-program-options-dev \
         libmount-dev \
         librocthrust-dev \
@@ -21,11 +47,18 @@ RUN apt update && \
         llvm-dev \
         rocm-llvm-dev
 
+# Configure system linker for ROCm
+RUN cat <<EOF > /etc/ld.so.conf.d/rocm.conf
+/opt/rocm/lib
+/opt/rocm/lib64
+EOF
+RUN ldconfig
+
 # Install a minimal CUDA SDK
 # HIP depends on the ROCm libraries being installed.
 # This means we are unable to have a separate CUDA+HIP image
 # without ROCm.
-RUN curl https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/x86_64/cuda-keyring_1.1-1_all.deb \
+RUN curl https://developer.download.nvidia.com/compute/cuda/repos/ubuntu${UBUNTU_MAJOR_VERSION}${UBUNTU_MINOR_VERSION}/x86_64/cuda-keyring_1.1-1_all.deb \
     -o cuda-repo-install.deb
 RUN apt install ./cuda-repo-install.deb
 # https://gitlab.com/nvidia/container-images/cuda/blob/master/dist/12.6.1/ubuntu2404/devel/Dockerfile