Skip to content

Commit 8418989

Browse files
committed
release: Unbreak the Fedora build
We have installation instructions that tell the user to use `poetry` and then we ourselves think we're clever and install only a known subset? It was only a matter of time until we broke this. Changelog-None
1 parent 5e42f46 commit 8418989

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

contrib/docker/Dockerfile.builder.fedora

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ RUN dnf update -y && \
1212
libsq3-devel \
1313
python3-devel \
1414
python3-mako \
15-
python3-pip \
15+
python3-pip \
16+
python3-virtualenv \
1617
python3-setuptools \
1718
redhat-lsb \
1819
net-tools \
@@ -30,5 +31,7 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_
3031
mv bitcoin-$BITCOIN_VERSION/share/man/man1/* /usr/share/man/man1 && \
3132
rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION
3233

33-
RUN python3 -m pip install --force-reinstall -U pip setuptools && \
34-
python3 -m pip install python-bitcoinlib pytest pytest-test-groups flake8 pytest-rerunfailures ephemeral-port-reserve
34+
ENV PATH=/opt/venv/bin:${PATH}
35+
RUN python3 -m pip install pip wheel && \
36+
python3 -m virtualenv /opt/venv && \
37+
/opt/venv/bin/python3 -m pip install --force-reinstall -U pip poetry wheel

tools/build-release.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ if [ "$1" = "--inside-docker" ]; then
88
PLTFM="$3"
99
git clone /src /build
1010
cd /build
11-
pip3 install -r plugins/clnrest/requirements.txt
11+
poetry export --without-hashes > /tmp/requirements.txt
12+
python3 -m pip install -r /tmp/requirements.txt
1213
./configure
1314
make VERSION="$VER"
1415
make install DESTDIR=/"$VER-$PLTFM" RUST_PROFILE=release

0 commit comments

Comments
 (0)