Skip to content

Commit

Permalink
Move the test-environment db configuration out of root's ~/.rpmmacros
Browse files Browse the repository at this point in the history
My reading of https://docs.docker.com/build/building/variables/#scoping
suggests that we could now remove the second "ARG PREFIX" from the
make stage because it should be inherited in the FROM base thing, but
s*** breaks if I remove it, so we'll just *shrug* and let it be I guess.

This is the first step to fixing rpm-software-management#3521.
  • Loading branch information
pmatilai committed Jan 16, 2025
1 parent 6c5cfc3 commit 39578b4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion tests/Dockerfile.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ RUN rm -f /usr/lib/rpm/macros.d/macros.transaction_ima
RUN dnf -y --enablerepo=updates install "sequoia-sq >= 1.0"
RUN dnf clean all

RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > /root/.rpmmacros
ARG PREFIX
# Make sure the built rpm find the system db (for shell usage)
RUN mkdir -p ${PREFIX}/etc/rpm
RUN echo "%_dbpath $(rpm --eval '%_dbpath')" > ${PREFIX}/etc/rpm/macros.db

# Workaround for pkgconf(1)'s unlisted dependency on rpm.
# This is needed for cmake to work without an rpm installation.
Expand Down

0 comments on commit 39578b4

Please sign in to comment.