From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Tue, 2 Jul 2024 09:19:31 +0000 (+0200)
Subject: switch el7 builds to Oracle Linux 7
X-Git-Tag: rec-5.2.0-alpha1~208^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F14400%2Fhead;p=thirdparty%2Fpdns.git

switch el7 builds to Oracle Linux 7
---

diff --git a/builder-support/dockerfiles/Dockerfile.target.el-7 b/builder-support/dockerfiles/Dockerfile.target.el-7
index c6fc1ef94f..a67155b251 120000
--- a/builder-support/dockerfiles/Dockerfile.target.el-7
+++ b/builder-support/dockerfiles/Dockerfile.target.el-7
@@ -1 +1 @@
-Dockerfile.target.centos-7
\ No newline at end of file
+Dockerfile.target.oraclelinux-7
\ No newline at end of file
diff --git a/builder-support/dockerfiles/Dockerfile.target.oraclelinux-7 b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-7
new file mode 100644
index 0000000000..7b47e231f0
--- /dev/null
+++ b/builder-support/dockerfiles/Dockerfile.target.oraclelinux-7
@@ -0,0 +1,18 @@
+# First do the source builds
+@INCLUDE Dockerfile.target.sdist
+
+# This defines the distribution base layer
+# Put only the bare minimum of common commands here, without dev tools
+FROM oraclelinux:7 as dist-base
+
+ARG BUILDER_CACHE_BUSTER=
+RUN touch /var/lib/rpm/* && yum install -y oracle-epel-release-el7 oracle-softwarecollection-release-el7 && \
+	yum-config-manager  --add-repo=http://yum.oracle.com/repo/OracleLinux/OL7/optional/developer/$(uname -m)/ && \
+    yum install -y --nogpgcheck devtoolset-11-gcc-c++ scl-utils
+
+# Do the actual rpm build
+@INCLUDE Dockerfile.rpmbuild
+
+# Do a test install and verify
+# Can be skipped with skippackagetest=1 in the environment
+@EXEC [ "$skippackagetest" = "" ] && include Dockerfile.rpmtest