ci: Update HIP image to ROCm 5.5 on Ubuntu 22.04

7 files changed, 58 insertions, 20 deletions

diff --git a/.gitlab/ci/docker/hip4.2/Dockerfile b/.gitlab/ci/docker/hip4.2/Dockerfile
deleted file mode 100644
index 563e94f..0000000
--- a/.gitlab/ci/docker/hip4.2/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM rocm/dev-ubuntu-20.04:4.2
-MAINTAINER Brad King <brad.king@kitware.com>
-
-ENV PATH="/opt/rocm/bin:$PATH"
-
-COPY install_deps.sh /root/install_deps.sh
-RUN sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/hip4.2/install_deps.sh b/.gitlab/ci/docker/hip4.2/install_deps.sh
deleted file mode 100755
index 2b45bc9..0000000
--- a/.gitlab/ci/docker/hip4.2/install_deps.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-apt-get update
-
-# Install development tools.
-apt-get install -y --no-install-recommends \
-    g++ \
-    curl \
-    git
-
-apt-get clean
diff --git a/.gitlab/ci/docker/hip5.5/Dockerfile b/.gitlab/ci/docker/hip5.5/Dockerfile
new file mode 100644
index 0000000..2deb3c6
--- /dev/null
+++ b/.gitlab/ci/docker/hip5.5/Dockerfile
@@ -0,0 +1,28 @@
+# syntax=docker/dockerfile:1
+
+ARG BASE_IMAGE=rocm/dev-ubuntu-22.04:5.5
+
+FROM ${BASE_IMAGE} AS apt-cache
+# Populate APT cache w/ the fresh metadata and prefetch packages.
+# Use an empty `docker-clean` file to "hide" the image-provided
+# file to disallow removing packages after `apt-get` operations.
+RUN --mount=type=tmpfs,target=/var/log \
+    --mount=type=bind,source=docker-clean,target=/etc/apt/apt.conf.d/docker-clean \
+    --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
+    apt-get update \
+ && apt-get --download-only -y install $(grep -h '^[^#]\+$' /root/*.lst)
+
+FROM ${BASE_IMAGE}
+MAINTAINER Brad King <brad.king@kitware.com>
+
+ENV PATH="/opt/rocm/bin:$PATH"
+
+RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \
+    --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \
+    --mount=type=bind,source=dpkg-exclude,target=/etc/dpkg/dpkg.cfg.d/exclude \
+    --mount=type=bind,source=docker-clean,target=/etc/apt/apt.conf.d/docker-clean \
+    --mount=type=cache,from=apt-cache,source=/var/lib/apt/lists,target=/var/lib/apt/lists \
+    --mount=type=cache,from=apt-cache,source=/var/cache/apt,target=/var/cache/apt,sharing=private \
+    --mount=type=tmpfs,target=/var/log \
+    --mount=type=tmpfs,target=/tmp \
+    sh /root/install_deps.sh
diff --git a/.gitlab/ci/docker/hip5.5/deps_packages.lst b/.gitlab/ci/docker/hip5.5/deps_packages.lst
new file mode 100644
index 0000000..9847925
--- /dev/null
+++ b/.gitlab/ci/docker/hip5.5/deps_packages.lst
@@ -0,0 +1,4 @@
+# Install development tools.
+g++
+curl
+git
diff --git a/.gitlab/ci/docker/hip5.5/docker-clean b/.gitlab/ci/docker/hip5.5/docker-clean
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/.gitlab/ci/docker/hip5.5/docker-clean
diff --git a/.gitlab/ci/docker/hip5.5/dpkg-exclude b/.gitlab/ci/docker/hip5.5/dpkg-exclude
new file mode 100644
index 0000000..60b6565
--- /dev/null
+++ b/.gitlab/ci/docker/hip5.5/dpkg-exclude
@@ -0,0 +1,21 @@
+# Drop all man pages
+path-exclude=/usr/share/man/*
+
+# Drop all info pages
+path-exclude=/usr/share/info/*
+
+# Drop all README files except from the some packages
+path-exclude=/usr/**/*README*
+path-include=/usr/share/devscripts/templates/README.mk-build-deps
+path-include=/usr/share/equivs/template/debian/README.Debian.in
+
+# Drop all translations
+path-exclude=/usr/share/locale/*/LC_MESSAGES/*.mo
+
+# Drop all documentation ...
+path-exclude=/usr/share/doc/*
+path-exclude=/usr/share/doc-base/*
+path-exclude=/usr/share/gtk-doc/*
+
+# Per package excludes
+path-exclude=/usr/share/gnupg/help.*.txt
diff --git a/.gitlab/ci/docker/hip5.5/install_deps.sh b/.gitlab/ci/docker/hip5.5/install_deps.sh
new file mode 100755
index 0000000..d1c8aed
--- /dev/null
+++ b/.gitlab/ci/docker/hip5.5/install_deps.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+set -e
+
+apt-get install -y $(grep '^[^#]\+$' /root/deps_packages.lst)