Skip to content

Commit

Permalink
- Upgraded python to 3.10 and bitcoin to v23.0
Browse files Browse the repository at this point in the history
- Added libzmq to build process, to enable future use cases such as cryptoadvance#778
- added --without-gui to remove configure warning that gui will not be built.
  • Loading branch information
relativisticelectron committed May 4, 2022
1 parent 0a3cb42 commit 312cb4f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
12 changes: 6 additions & 6 deletions docker/python-bitcoind/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

FROM python:3.8
FROM python:3.10

# Installing BerkleyDB 4.8.30
# Ubuntu specific buw works on debian Buster as well
Expand All @@ -12,14 +12,14 @@ RUN wget https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin/+files/libdb4.8+
wget https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin/+files/libdb4.8++_4.8.30-artful3_amd64.deb
RUN dpkg -i *.deb && rm *.deb

RUN apt update && apt install git build-essential autoconf libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqt4-dev libqrencode-dev libtool libevent-dev pkg-config bsdmainutils -y
RUN apt update && apt install git build-essential autoconf libboost-all-dev libssl-dev libprotobuf-dev protobuf-compiler libqrencode-dev libtool libevent-dev pkg-config bsdmainutils libzmq5-dev -y

RUN git clone https://github.com/bitcoin/bitcoin.git
RUN cd bitcoin && git checkout v0.20.1
RUN cd bitcoin && ./autogen.sh && ./configure && make
RUN cd bitcoin && git checkout v23.0
RUN cd bitcoin && ./autogen.sh && ./configure --without-gui && make -j8
RUN cd bitcoin && make install

FROM python:3.8
FROM python:3.10

# Installing BerkleyDB 4.8.30
# Works on debian Buster as well
Expand All @@ -32,7 +32,7 @@ RUN wget https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin/+files/libdb4.8+
wget https://launchpad.net/~bitcoin/+archive/ubuntu/bitcoin/+files/libdb4.8++_4.8.30-artful3_amd64.deb
RUN dpkg -i *.deb && rm *.deb

RUN apt update && apt install libevent-dev libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev jq -y
RUN apt update && apt install libevent-dev libboost-system-dev libboost-filesystem-dev libboost-chrono-dev libboost-test-dev libboost-thread-dev jq libzmq5-dev -y

COPY --from=0 /usr/local/bin/bitcoind /usr/local/bin
COPY --from=0 /usr/local/bin/bitcoin-cli /usr/local/bin
Expand Down
8 changes: 4 additions & 4 deletions docker/python-bitcoind/Readme.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
This Dockerimage is manually created and uploaded:

```
docker build -t registry.gitlab.com/cryptoadvance/specter-desktop/python-bitcoind:v0.20.1 .
docker build -t registry.gitlab.com/cryptoadvance/specter-desktop/python-bitcoind:v23.0 .
```
```
docker push registry.gitlab.com/cryptoadvance/specter-desktop/python-bitcoind:v0.20.1
docker push registry.gitlab.com/cryptoadvance/specter-desktop/python-bitcoind:v23.0
```
Here the version is v0.20.1 but that's just an example. This folder just explains how the image is created. Which image is USED is specified:
Here the version is v23.0 but that's just an example. This folder just explains how the image is created. Which image is USED is specified:

* In the case of tests in pytest.ini in the addopts-line (MIGHT be different in different branches)
* in the case of running
Expand All @@ -19,4 +19,4 @@ but you can override like this:

```
python3 -m cryptoadvance.specter bitcoind --docker-tag v0.19.1
```
```
4 changes: 2 additions & 2 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[pytest]
norecursedirs = tests/bitcoin* tests/elements tests/xtestdata_testextensions
log_format = [%(levelname)8s] %(message)s %(name)s (%(filename)s:%(lineno)s)
addopts = --bitcoind-version v22.0.0 --elementsd-version v0.21.0.2
addopts = --bitcoind-version v23.0 --elementsd-version v0.21.0.2
markers =
slow: mark test as slow.
elm: mark test as elementsd dependent
#log_cli = 1

filterwarnings =
ignore::DeprecationWarning:bitbox02[.*]
ignore::DeprecationWarning:bitbox02[.*]

0 comments on commit 312cb4f

Please sign in to comment.