From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Fri, 5 Mar 2021 09:31:24 +0000 (+0100)
Subject: builder: add centos 8 stream support
X-Git-Tag: dnsdist-1.6.0-rc1~10^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fea5137ecaf6780db22fc749cb162c9c808ee642;p=thirdparty%2Fpdns.git

builder: add centos 8 stream support
---

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8 b/builder-support/dockerfiles/Dockerfile.target.centos-8
index bd206d0cd4..f5d9ffee1c 100644
--- a/builder-support/dockerfiles/Dockerfile.target.centos-8
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8
@@ -3,7 +3,7 @@
 
 # This defines the distribution base layer
 # Put only the bare minimum of common commands here, without dev tools
-@IF [ ${BUILDER_TARGET} = centos-8 ]
+@IF [ ${BUILDER_TARGET} = centos-8 -o ${BUILDER_TARGET} = centos-8-stream ]
 FROM centos:8 as dist-base
 @ENDIF
 @IF [ ${BUILDER_TARGET} = centos-8-amd64 ]
@@ -12,7 +12,13 @@ FROM amd64/centos:8 as dist-base
 @IF [ ${BUILDER_TARGET} = centos-8-arm64 ]
 FROM arm64v8/centos:8 as dist-base
 @ENDIF
+
 ARG BUILDER_CACHE_BUSTER=
+
+@IF [[ $BUILDER_TARGET = *stream* ]]
+RUN touch /var/lib/rpm/* && dnf swap -y centos-linux-repos centos-stream-repos && dnf -y distro-sync
+@ENDIF
+
 RUN touch /var/lib/rpm/* && dnf install -y epel-release && \
     dnf install -y 'dnf-command(config-manager)' && \
     dnf config-manager --set-enabled powertools
diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8-stream b/builder-support/dockerfiles/Dockerfile.target.centos-8-stream
new file mode 120000
index 0000000000..cfe890509a
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8-stream
@@ -0,0 +1 @@
+Dockerfile.target.centos-8
\ No newline at end of file