From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 8 Feb 2021 08:55:11 +0000 (+0100)
Subject: Merge pull request #10068 from Habbie/no-more-yum
X-Git-Tag: dnsdist-1.6.0-alpha2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed48941352c035ff9666c4857f7a66e8a1e334f7;p=thirdparty%2Fpdns.git

Merge pull request #10068 from Habbie/no-more-yum

docker builds: stop using yum on EL8 derivatives
---

ed48941352c035ff9666c4857f7a66e8a1e334f7
diff --cc builder-support/dockerfiles/Dockerfile.target.centos-8
index ee8cc74f37,cc25e21bdc..bd206d0cd4
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8
@@@ -3,17 -3,9 +3,17 @@@
  
  # This defines the distribution base layer
  # Put only the bare minimum of common commands here, without dev tools
 +@IF [ ${BUILDER_TARGET} = centos-8 ]
  FROM centos:8 as dist-base
 +@ENDIF
 +@IF [ ${BUILDER_TARGET} = centos-8-amd64 ]
 +FROM amd64/centos:8 as dist-base
 +@ENDIF
 +@IF [ ${BUILDER_TARGET} = centos-8-arm64 ]
 +FROM arm64v8/centos:8 as dist-base
 +@ENDIF
  ARG BUILDER_CACHE_BUSTER=
- RUN touch /var/lib/rpm/* && yum install -y epel-release && \
+ RUN touch /var/lib/rpm/* && dnf install -y epel-release && \
      dnf install -y 'dnf-command(config-manager)' && \
      dnf config-manager --set-enabled powertools