From 6b6583d8c329a512f3960cad22d8cfe8bfe1a7f3 Mon Sep 17 00:00:00 2001 From: CrazyMax <1951866+crazy-max@users.noreply.github.com> Date: Mon, 27 May 2024 14:40:30 +0200 Subject: [PATCH] dockerfile: fix test-base-rhel Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com> --- src/Dockerfile | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Dockerfile b/src/Dockerfile index abf8c96..5fb5d76 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -38,19 +38,26 @@ RUN </dev/null; then - if [ "$ID" != "fedora" ]; then - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION:0:1}.noarch.rpm - fi + case "$ID" in + fedora) ;; + rocky) + dnf install -y epel-release + ;; + *) + yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-${VERSION:0:1}.noarch.rpm + yum update -y + ;; + esac fi fi +if command -v dnf >/dev/null 2>/dev/null; then + dnf install -y bats vim +else + yum install -y bats vim +fi EOT -RUN --mount=type=cache,target=/pkg-cache \ - rm -rf /var/cache/yum && \ - ln -s /pkg-cache /var/cache/yum && \ - yum update -y && yum -y install bats vim WORKDIR /work - FROM test-base-${TEST_BASE_TYPE} AS test-base ADD --chmod=755 https://raw.githubusercontent.com/fsaintjacques/semver-tool/3.4.0/src/semver /usr/bin/semver COPY --from=bats-assert . .