Skip to content

Commit

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

auth-4.4.x: builder: migrate EL8 builds to oraclelinux, rename centos8 to el8 where possible
  • Loading branch information
Habbie authored Feb 3, 2022
2 parents 494cff9 + fa24e8b commit d48ae68
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 0 deletions.
1 change: 1 addition & 0 deletions builder-support/dockerfiles/Dockerfile.target.el-7
1 change: 1 addition & 0 deletions builder-support/dockerfiles/Dockerfile.target.el-8
1 change: 1 addition & 0 deletions builder-support/dockerfiles/Dockerfile.target.el-8-amd64
1 change: 1 addition & 0 deletions builder-support/dockerfiles/Dockerfile.target.el-8-arm64
26 changes: 26 additions & 0 deletions builder-support/dockerfiles/Dockerfile.target.oraclelinux-8
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# 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
@IF [ ${BUILDER_TARGET} = oraclelinux-8 -o ${BUILDER_TARGET} = el-8 ]
FROM oraclelinux:8 as dist-base
@ENDIF
@IF [ ${BUILDER_TARGET} = oraclelinux-8-amd64 -o ${BUILDER_TARGET} = el-8-amd64 ]
FROM amd64/oraclelinux:8 as dist-base
@ENDIF
@IF [ ${BUILDER_TARGET} = oraclelinux-8-arm64 -o ${BUILDER_TARGET} = el-8-arm64 ]
FROM arm64v8/oraclelinux:8 as dist-base
@ENDIF

ARG BUILDER_CACHE_BUSTER=
RUN touch /var/lib/rpm/* && dnf install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
dnf install -y 'dnf-command(config-manager)' yum && \
dnf config-manager --set-enabled ol8_codeready_builder

# 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

0 comments on commit d48ae68

Please sign in to comment.