From afd5713fc368a1f493061152a5a7a58068c46198 Mon Sep 17 00:00:00 2001 From: Peter van Dijk Date: Tue, 2 Jul 2024 11:19:31 +0200 Subject: [PATCH] switch el7 builds to Oracle Linux 7 (cherry picked from commit 73a1b98f92c671c590540ac19d74d70499f89066) --- .../dockerfiles/Dockerfile.target.el-7 | 2 +- .../Dockerfile.target.oraclelinux-7 | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 builder-support/dockerfiles/Dockerfile.target.oraclelinux-7 diff --git a/builder-support/dockerfiles/Dockerfile.target.el-7 b/builder-support/dockerfiles/Dockerfile.target.el-7 index c6fc1ef94f7c..a67155b251c2 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 000000000000..7b47e231f079 --- /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