Skip to content

Commit 1effaa3

Browse files
committed
Mock (<= v6.6) relies on existing resolv.conf with --hermetic-build
Related: https://bugzilla.redhat.com/show_bug.cgi?id=2433808 Related: rpm-software-management/mock#1697 Closes: konflux-ci#118
1 parent 2b345c2 commit 1effaa3

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

Containerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,6 @@ RUN sed -i 's/# Note: These calls will alter the results of any subsequent macro
4141
# Assert utility versions
4242
RUN test "$(rpm --eval '%[ v"'"$(rpm -q --qf '%{VERSION}\n' mock)"'" >= v"6.4" ]')" = "1"
4343

44+
ADD resolv.conf /etc/resolv.conf
45+
4446
RUN grep sys.exit /usr/lib/python3.*/site-packages/rpmautospec/specparser.py

resolv.conf

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# This empty file is required for Mock to function correctly in modern Podman
2+
# with --network=none. See these links for more information:
3+
# https://bugzilla.redhat.com/show_bug.cgi?id=2433808
4+
# rpm-software-management/mock#1697
5+
# https://github.com/konflux-ci/rpmbuild-pipeline-environment-container/pull/118

0 commit comments

Comments
 (0)