Skip to content

Commit

Permalink
release: Unbreak the Fedora build
Browse files Browse the repository at this point in the history
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
  • Loading branch information
cdecker committed Feb 27, 2024
1 parent 898c094 commit 8bd4e04
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions contrib/docker/Dockerfile.builder.fedora
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ RUN dnf update -y && \
libsq3-devel \
python3-devel \
python3-mako \
python3-pip \
python3-pip \
python3-virtualenv \
python3-setuptools \
redhat-lsb \
net-tools \
Expand All @@ -30,5 +31,7 @@ RUN wget https://bitcoin.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_
mv bitcoin-$BITCOIN_VERSION/share/man/man1/* /usr/share/man/man1 && \
rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION

RUN python3 -m pip install --force-reinstall -U pip setuptools && \
python3 -m pip install python-bitcoinlib pytest pytest-test-groups flake8 pytest-rerunfailures ephemeral-port-reserve
ENV PATH=/opt/venv/bin:${PATH}
RUN python3 -m pip install pip wheel && \
python3 -m virtualenv /opt/venv && \
/opt/venv/bin/python3 -m pip install --force-reinstall -U pip poetry wheel
3 changes: 2 additions & 1 deletion tools/build-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ if [ "$1" = "--inside-docker" ]; then
PLTFM="$3"
git clone /src /build
cd /build
pip3 install -r plugins/clnrest/requirements.txt
poetry export --without-hashes > /tmp/requirements.txt
python3 -m pip install -r /tmp/requirements.txt
./configure
make VERSION="$VER"
make install DESTDIR=/"$VER-$PLTFM" RUST_PROFILE=release
Expand Down

0 comments on commit 8bd4e04

Please sign in to comment.