Skip to content

Commit

Permalink
Merge pull request PowerDNS#14422 from Habbie/backport-14403-to-auth-…
Browse files Browse the repository at this point in the history
…4.7.x

auth-4.7: switch el7 builds to Oracle Linux 7
  • Loading branch information
omoerbeek authored Jul 12, 2024
2 parents 49833ad + 700d789 commit 609e59b
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/builder.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
matrix:
product: ['authoritative']
os:
- centos-7
- el-7
- ubuntu-bionic
- el-8
- centos-9-stream
Expand Down
2 changes: 1 addition & 1 deletion builder-support/dockerfiles/Dockerfile.target.el-7
18 changes: 18 additions & 0 deletions builder-support/dockerfiles/Dockerfile.target.oraclelinux-7
Original file line number Diff line number Diff line change
@@ -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-8-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

0 comments on commit 609e59b

Please sign in to comment.