diff --git a/.gitlab/ci/docker/fedora41-hip/Dockerfile b/.gitlab/ci/docker/fedora41-hip/Dockerfile index 606ddcc52a..ac7a0ff305 100644 --- a/.gitlab/ci/docker/fedora41-hip/Dockerfile +++ b/.gitlab/ci/docker/fedora41-hip/Dockerfile @@ -3,25 +3,10 @@ ARG BASE_IMAGE=fedora:41 FROM ${BASE_IMAGE} AS dnf-cache -# Populate DNF cache w/ the fresh metadata and prefetch packages. -RUN --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=tmpfs,target=/var/log \ - --mount=type=tmpfs,target=/tmp \ - dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - --downloadonly \ - -y \ - $(grep -h '^[^#]\+$' /root/*.lst) - -FROM ${BASE_IMAGE} LABEL maintainer="Brad King " - -RUN --mount=type=bind,source=install_deps.sh,target=/root/install_deps.sh \ +RUN --mount=type=bind,source=dnf.conf,target=/etc/dnf/dnf.conf \ --mount=type=bind,source=deps_packages.lst,target=/root/deps_packages.lst \ - --mount=type=cache,from=dnf-cache,source=/var/lib/dnf,target=/var/lib/dnf,sharing=private \ - --mount=type=cache,target=/var/cache/pip \ + --mount=type=cache,target=/var/lib/dnf \ --mount=type=tmpfs,target=/var/log \ --mount=type=tmpfs,target=/tmp \ - sh /root/install_deps.sh + dnf install -y $(grep -h '^[^#]\+$' /root/*.lst) diff --git a/.gitlab/ci/docker/fedora41-hip/dnf.conf b/.gitlab/ci/docker/fedora41-hip/dnf.conf new file mode 100644 index 0000000000..1189746973 --- /dev/null +++ b/.gitlab/ci/docker/fedora41-hip/dnf.conf @@ -0,0 +1,32 @@ +[main] +autocheck_running_kernel=0 +debuglevel=2 +diskspacecheck=0 +fastestmirror=1 +gpgcheck=1 +installonly_limit=5 +install_weak_deps=0 +keepcache=1 +log_rotate=0 +max_parallel_downloads=10 +metadata_expire=90m +multilib_policy=best +plugins=1 +tsflags=nodocs + +# Enable color for all output +color=always + +# Default color options according to yum.conf(5) +color_list_installed_older=bold,black +color_list_installed_newer=bold,yellow +color_list_installed_reinstall=normal +color_list_installed_extra=bold,red +color_list_available_upgrade=bold,blue +color_list_available_downgrade=dim,yellow +color_list_available_install=normal +color_list_available_reinstall =bold,underline,green +color_search_match=bold,magenta +color_update_installed=green +color_update_local=cyan +color_update_remote=yellow diff --git a/.gitlab/ci/docker/fedora41-hip/install_deps.sh b/.gitlab/ci/docker/fedora41-hip/install_deps.sh deleted file mode 100755 index eedff9c3a6..0000000000 --- a/.gitlab/ci/docker/fedora41-hip/install_deps.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -set -e - -dnf install \ - --setopt=install_weak_deps=False \ - --setopt=fastestmirror=True \ - --setopt=max_parallel_downloads=10 \ - -y \ - $(grep '^[^#]\+$' /root/deps_packages.lst)