From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Thu, 10 Oct 2019 12:03:21 +0000 (+0200)
Subject: Add CentOS 8 as builder target
X-Git-Tag: dnsdist-1.4.0-rc4~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19293f266cf7bb719bd6975b3e06994f49e0e583;p=pdns

Add CentOS 8 as builder target
---

diff --git a/builder-support/dockerfiles/Dockerfile.target.centos-8 b/builder-support/dockerfiles/Dockerfile.target.centos-8
new file mode 100644
index 000000000..0a123c546
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.centos-8
@@ -0,0 +1,17 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+# This defines the dstribution base layer
+# Put only the bare minimum of common commands here, without dev tools
+FROM centos:8 as dist-base
+ARG BUILDER_CACHE_BUSTER=
+RUN yum install -y epel-release && \
+    dnf install -y 'dnf-command(config-manager)' && \
+    dnf config-manager --set-enabled PowerTools
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+
+# Do a test install and verify
+# Can be skipped with skiptests=1 in the environment
+# @EXEC [ "$skiptests" = "" ] && include Dockerfile.rpmtest
diff --git a/builder-support/specs/dnsdist.spec b/builder-support/specs/dnsdist.spec
index b85c70613..145f2d3b3 100644
--- a/builder-support/specs/dnsdist.spec
+++ b/builder-support/specs/dnsdist.spec
@@ -56,7 +56,10 @@ Requires(pre): shadow
 %endif
 %if 0%{?rhel} >= 7
 Requires(pre): shadow-utils
+%if 0%{?rhel} == 7
+# No fstrm in EPEL 8 (yet) https://bugzilla.redhat.com/show_bug.cgi?id=1760298
 BuildRequires: fstrm-devel
+%endif
 %systemd_requires
 %endif
 
@@ -98,8 +101,10 @@ sed -i '/^ExecStart/ s/dnsdist/dnsdist -u dnsdist -g dnsdist/' dnsdist.service.i
   --without-protobuf \
   --without-net-snmp
 %endif
-%if 0%{?rhel} >= 7
+%if 0%{?rhel} == 7
   --enable-dnstap \
+%endif
+%if 0%{?rhel} >= 7
   --with-gnutls \
   --with-protobuf \
   --with-lua=%{lua_implementation} \
diff --git a/builder-support/specs/pdns-recursor.spec b/builder-support/specs/pdns-recursor.spec
index 758ae8817..7f354b859 100644
--- a/builder-support/specs/pdns-recursor.spec
+++ b/builder-support/specs/pdns-recursor.spec
@@ -35,8 +35,12 @@ BuildRequires: libatomic
 %if 0%{?rhel} >= 7
 BuildRequires: protobuf-compiler
 BuildRequires: protobuf-devel
+
+%if 0%{?rhel} == 7
+# No fstrm in EPEL 8 yet
 BuildRequires: fstrm-devel
 %endif
+%endif
 
 BuildRequires: openssl-devel
 BuildRequires: net-snmp-devel
diff --git a/builder-support/specs/pdns.spec b/builder-support/specs/pdns.spec
index d8d760034..90096b323 100644
--- a/builder-support/specs/pdns.spec
+++ b/builder-support/specs/pdns.spec
@@ -166,7 +166,9 @@ Summary: Geo backend for %{name}
 Group: System Environment/Daemons
 Requires: %{name}%{?_isa} = %{version}-%{release}
 BuildRequires: yaml-cpp-devel
+%if 0%{?rhel} <= 7
 BuildRequires: geoip-devel
+%endif
 BuildRequires: libmaxminddb-devel
 %global backends %{backends} geoip