V2026.4 (#22)

Upgrade project

Author: evehash

.env.example

@@ -5,7 +5,7 @@ SHARED_GID=1099
 # Tor expert bundle version and platform to build the container.
 # To be obtained from this site: https://gitweb.torproject.org/tor.git
 # Example: tor-0.4.8.10
-TOR_VERSION=0.4.8.13
+TOR_VERSION=0.4.9.6
 
 # User identifier used for tor inside the container.
 TOR_USER_ID=1099
@@ -16,7 +16,7 @@ TOR_DATA=./volumes/tor
 # i2p version to build the container.
 # To be obtained from this site: https://github.com/i2p/i2p.i2p/releases
 # Example: i2p-2.7.0
-I2P_VERSION=2.7.0
+I2P_VERSION=2.11.0
 
 # User identifier used for i2p inside the container.
 I2P_USER_ID=1000
@@ -27,19 +27,19 @@ I2P_DATA=./volumes/i2p
 # Bitcoin core version to build the container.
 # To be obtained from this site: https://github.com/bitcoin/bitcoin/releases
 # Example: bitcoin-v26.0
-BITCOIN_VERSION=28.1
+BITCOIN_VERSION=30.2
 
 # Directory on the local machine where to mount the data volume for bitcoin 
 # core (where the blockchain, indexes and configuration will be stored)
-BITCOIN_DATA=./volumes/bitcoind
+BITCOIN_DATA=./volumes/bitcoin
 
 # User identifier used for bitcoin inside the container
 BITCOIN_USER_ID=1099
 
 # Electrs version to build the container.
 # To be obtained from this site: https://github.com/romanz/electrs/releases
 # Example: v0.10.1
-ELECTRS_VERSION=0.10.8
+ELECTRS_VERSION=0.11.1
 
 # Port on the local machine where to bind Electrs
 ELECTRS_SSL_PORT=50002
@@ -53,7 +53,7 @@ ELECTRS_USER_ID=1099
 # BTC Explorer to build the container.
 # To be obtained from this site: https://github.com/janoside/btc-rpc-explorer/releases
 # Example: v3.3.0.tar.gz (3.3.0)
-BTC_RPC_EXPLORER_VERSION=3.4.0
+BTC_RPC_EXPLORER_VERSION=3.5.1
 
 # Port on the local machine where to bind btc explorer
 BTC_RPC_EXPLORER_HTTPS_PORT=3003

.github/workflows/build.yml

@@ -1,14 +1,14 @@
-name: daily build
+name: weekly build
 on:
   workflow_dispatch:
   schedule:
-    - cron: 0 0 * * *
+    - cron: 0 0 * * 1
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Build default images
         run: docker compose --env-file .env.example build
       - name: Build disabled images

GETTING_STARTED.md

@@ -5,7 +5,7 @@
 - <a href="#setup-the-multi-container-applications">Setup the multi-container applications</a>
 - <a href="#running-services-for-the-first-time">Running services for the first time</a>
   - <a href="#tor">tor</a>
-  - <a href="#bitcoind">bitcoind</a>
+  - <a href="#bitcoin">bitcoin</a>
   - <a href="#electrs">electrs</a>
   - <a href="#btcrpcexplorer">btcrpcexplorer</a>
   - <a href="#nginx">nginx</a>
@@ -84,7 +84,7 @@ SHARED_GID=1099
 
 # The paths where to mount the volumes.
 TOR_DATA=/mnt/hdd/tor
-BITCOIN_DATA=/mnt/hdd/bitcoind
+BITCOIN_DATA=/mnt/hdd/bitcoin
 ELECTRS_DATA=/mnt/hdd/electrs
 BTC_RPC_EXPLORER_DATA=/mnt/hdd/btcrpcexplorer
 NGINX_DATA=/mnt/hdd/nginx
@@ -96,7 +96,7 @@ Optionally, the user id of each service can be adjusted to match the user id of
 
 For the first installation, we recommend starting the services one at a time. Take your time to verify by yourself the `Dockerfiles` and validate that the services are being deployed correctly.
 
-It is also important because bitcoind will take a long time to synchronize, and if in the meantime, the rest of the containers that depend on it are continuously failing because the service is not available, these are resources that will make the process take even longer.
+It is also important because bitcoin will take a long time to synchronize, and if in the meantime, the rest of the containers that depend on it are continuously failing because the service is not available, these are resources that will make the process take even longer.
 
 ### tor
 
@@ -125,11 +125,11 @@ $ docker logs -f 06a96296854a
 
 
 
-### bitcoind
+### bitcoin
 
-The bitcoind configuration file is located in `/mnt/hdd/bitcoind/bitcoin.conf`. The default parameters are enough, except for one that depends on the memory of your local machine and the default password for communication between services, which you should generate yourself for security reasons.
+The bitcoin configuration file is located in `/mnt/hdd/bitcoin/bitcoin.conf`. The default parameters are enough, except for one that depends on the memory of your local machine and the default password for communication between services, which you should generate yourself for security reasons.
 
-The more cache bitcoind has, the faster it will be downloading and synchronizing the blocks. As a reference, you can set half of the machine memory expressed in MB. For example, if the node has 4GB of RAM, you can put 2048.
+The more cache bitcoin has, the faster it will be downloading and synchronizing the blocks. As a reference, you can set half of the machine memory expressed in MB. For example, if the node has 4GB of RAM, you can put 2048.
 
 ```conf
 dbcache=2048
@@ -157,14 +157,14 @@ Replace the two strings in the configuration file and take note of the passwords
 
 This is the longest process and until it is finished we cannot continue. Your node will start synchronizing the entire blockchain with the rest of peers. This process can take days or even weeks. It's very difficult to give an estimation, because it depends on the capacity of your hardware, the state of the network, your connection speed... So be patient.
 
-Run the following command `docker compose up -d bitcoind` to start the service and check the logs to be sure that the services is running properly.
+Run the following command `docker compose up -d bitcoin` to start the service and check the logs to be sure that the services is running properly.
 
-For this example, after a certain time, bitcoind was already synchronizing the 769944 block height (`height=769944`) and almost all the blockchain was already synchronized (`progress=0.999838`). At the time of writing this document, this was the last block mined, so the node was synchronized and we can move the next step.
+For this example, after a certain time, bitcoin was already synchronizing the 769944 block height (`height=769944`) and almost all the blockchain was already synchronized (`progress=0.999838`). At the time of writing this document, this was the last block mined, so the node was synchronized and we can move the next step.
 
 ```shell
-$ docker compose up bitcoind -d
-$ docker ps | grep bitcoind
-# 7cc89e57effb   bitcoind:24.0.1
+$ docker compose up bitcoin -d
+$ docker ps | grep bitcoin
+# 7cc89e57effb   bitcoin:30.2
 $ docker logs -f 7cc89e57effb
 # You should see it synchronizing blocks as follows:
 #
@@ -182,11 +182,11 @@ $ docker logs -f 7cc89e57effb
 
 ### electrs
 
-The electrs configuration file is located in `/mnt/hdd/electrs/electrs.conf`. The default parameters are enough, except for the password which must be replaced by the one generated earlier when configuring bitcoind.
+The electrs configuration file is located in `/mnt/hdd/electrs/electrs.conf`. The default parameters are enough, except for the password which must be replaced by the one generated earlier when configuring bitcoin.
 
 Run the following command `docker compose up -d electrs` to start the service and check the logs to be sure that the service is running properly.
 
-For this example, we can see that electrs has already indexed the entire blockchain (`height=769944`, same block height as bitcoind).
+For this example, we can see that electrs has already indexed the entire blockchain (`height=769944`, same block height as bitcoin).
 
 ```shell
 $ docker ps | grep electrs
@@ -200,11 +200,11 @@ $ docker logs -f 92ebe51900c9
 
 ### btcrpcexplorer
 
-The btc-rpc-explorer configuration file is located in `/mnt/hdd/btcrpcexplorer/btc-rpc-explorer.env`. The default parameters are also enough, except for the password which must be replaced by the one generated earlier when configuring bitcoind.
+The btc-rpc-explorer configuration file is located in `/mnt/hdd/btcrpcexplorer/btc-rpc-explorer.env`. The default parameters are also enough, except for the password which must be replaced by the one generated earlier when configuring bitcoin.
 
 Run the following command `docker compose up -d btcrpcexplorer` to start the service and check the logs to be sure that the service is running properly.
 
-For this example, we can see that the service has beed started and it's connected to bitcoind (`RPC Connected: ... subversion=/Satoshi:24.0.1`)
+For this example, we can see that the service has beed started and it's connected to bitcoin (`RPC Connected: ... subversion=/Satoshi:24.0.1`)
 
 ```shell
 $ docker compose up -d btcrpcexplorer
@@ -223,7 +223,7 @@ $ docker logs -f c8b93a8b9410
 # 2023-01-02T17:21:34.479Z btcexp:app Environment(development) - Node: v16.19.0, Platform: linux, Versions: {"node":"16.19.0","v8":"9.4.146.26-node.24","uv":"1.43.0","zlib":"1.2.11","brotli":"1.0.9","ares":"1.18.1","modules":"93","nghttp2":"1.47.0","napi":"8","llhttp":"6.0.10","openssl":"1.1.1s+quic","cldr":"41.0","icu":"71.1","tz":"2022f","unicode":"14.0","ngtcp2":"0.8.1","nghttp3":"0.7.0"}
 # 2023-01-02T17:21:34.479Z btcexp:app No sourcecode version available, continuing to use default cacheId '3.3.0'
 # 2023-01-02T17:21:34.479Z btcexp:app Starting BTC RPC Explorer, v3.3.0 at http://172.18.0.5:3002/
-# 2023-01-02T17:21:34.479Z btcexp:app Connecting to RPC node at bitcoind:8332
+# 2023-01-02T17:21:34.479Z btcexp:app Connecting to RPC node at bitcoin:8332
 # 2023-01-02T17:21:34.484Z btcexp:app Verifying RPC connection...
 # 2023-01-02T17:21:34.487Z btcexp:app Loading mining pools config
 # 2023-01-02T17:21:34.515Z btcexp:app RPC Connected: version=240001 subversion=/Satoshi:24.0.1/, parsedVersion(used for RPC versioning)=24.0.1, protocolversion=70016, chain=main, services=[NETWORK, WITNESS, NETWORK_LIMITED]
@@ -245,7 +245,7 @@ Two files `certificate.crt` and `certificate.key` will be generated. It is impor
 
 Finally, run the following command `docker compose up -d nginx` to start the service and check the logs to be sure that the service is running properly.
 
-For this example, we can see that the service has beed started and it's connected to bitcoind.
+For this example, we can see that the service has beed started and it's connected to bitcoin.
 
 ```shell
 $ docker ps | grep nginx
@@ -268,9 +268,9 @@ If you have reached this point, you should be able to access btc-rpc-explorer an
 
 ## Post-installation
 
-Once the node has been synchronized, we can change the bitcoind dbcache to the minimum. It is no longer necessary to have so much memory for this purpose.
+Once the node has been synchronized, we can change the bitcoin dbcache to the minimum. It is no longer necessary to have so much memory for this purpose.
 
-Edit the bitcoind configuration file and change this parameter.
+Edit the bitcoin configuration file and change this parameter.
 
 ```conf
 dbcache=360

README.md

@@ -30,12 +30,12 @@ The following services are deployed:
 
 | Service                                                                         | Version      | Base image         | Size    |
 | ------------------------------------------------------------------------------- | ------------ | ------------------ | --------|
-| <a href="https://gitlab.torproject.org/tpo/core/tor/">Tor</a>                   | 0.4.8.13     | debian:stable-slim | 83.2 MB |
-| <a href="https://github.com/bitcoin/bitcoin">Bitcoin core</a>                   | 28.1         | debian:stable-slim | 79.8 MB |
-| <a href="https://github.com/romanz/electrs">Electrs</a>                         | 0.10.8       | debian:stable-slim | 80.7 MB |
-| <a href="https://github.com/janoside/btc-rpc-explorer">Bitcoin RPC Explorer</a> | 3.4.0        | node:22-slim       | 377 MB  |
+| <a href="https://gitlab.torproject.org/tpo/core/tor/">Tor</a>                   | 0.4.9.6      | debian:stable-slim | 88.1 MB |
+| <a href="https://github.com/bitcoin/bitcoin">Bitcoin core</a>                   | 30.2         | debian:stable-slim | 84.2 MB |
+| <a href="https://github.com/romanz/electrs">Electrs</a>                         | 0.11.1       | debian:stable-slim | 106 MB  |
+| <a href="https://github.com/janoside/btc-rpc-explorer">Bitcoin RPC Explorer</a> | 3.5.1        | node:22-slim       | 377 MB  |
 | <a href="https://github.com/nginxinc/docker-nginx">NGINX</a>                    | stable-slim  | nginx:alpine-slim  | 11.5 MB |
-| <a href="https://github.com/i2p/i2p.i2p">i2p</a> (optional)                     | 2.7.0        | alpine:latest      | 222 MB  |
+| <a href="https://github.com/i2p/i2p.i2p">i2p</a> (optional)                     | 2.11.0       | alpine:latest      | 232 MB  |
 
 ## Documentation
 

bitcoind/Dockerfile bitcoin/Dockerfilebitcoind/Dockerfile renamed to bitcoin/Dockerfile

@@ -1,7 +1,8 @@
 FROM debian:stable-slim AS build
 ARG BITCOIN_VERSION
+
 RUN apt-get update \
-  && apt-get install automake autotools-dev bsdmainutils build-essential cmake curl git libtool pkg-config -y \
+  && apt-get install --no-install-recommends -y build-essential ca-certificates cmake curl git gpg gpg-agent patch pkg-config python3 \
   && cd /tmp \
   && curl \
     -O https://raw.githubusercontent.com/bitcoin-core/guix.sigs/main/builder-keys/achow101.gpg \
@@ -17,30 +18,34 @@ RUN apt-get update \
   && cd bitcoin \
   && git verify-tag v${BITCOIN_VERSION} \
   && cd depends \
-  && make HOST=$(gcc -dumpmachine) NO_BDB=1 NO_QT=1 NO_QR=1 NO_SQLITE=1 NO_NATPMP=1 NO_UPNP=1 NO_ZMQ=1 NO_USDT=1 NO_WALLET=1 NO_HARDEN=1 \
+  && make -j$(nproc) HOST=$(gcc -dumpmachine) NO_QT=1 NO_QR=1 NO_ZMQ=1 NO_USDT=1 NO_WALLET=1 \
   && cd .. \
-  && ./autogen.sh \
-  && ./configure \
-    --prefix=$PWD/depends/$(gcc -dumpmachine) LDFLAGS="-static-libstdc++ -s" \
-    --disable-bench \
-    --disable-cli \
-    --disable-external-signer \
-    --disable-fuzz-binary \
-    --disable-man \
-    --disable-tests \
-    --enable-reduce-exports \
-    --without-utils \
-  && make \
-  && gzexe src/bitcoind \
-  && apt-get remove automake autotools-dev bsdmainutils build-essential cmake curl git libtool pkg-config -y
+  && cmake -B build \
+    --toolchain depends/$(gcc -dumpmachine)/toolchain.cmake \
+    -DBUILD_BENCH=OFF \
+    -DBUILD_CLI=OFF \
+    -DENABLE_EXTERNAL_SIGNER=OFF \
+    -DBUILD_FUZZ_BINARY=OFF \
+    -DBUILD_TESTS=OFF \
+    -DINSTALL_MAN=OFF \
+    -DREDUCE_EXPORTS=ON \
+    -DAPPEND_LDFLAGS="-static-libstdc++ -s" \
+  && cmake --build build -j$(nproc) \
+  && gzexe build/bin/bitcoind
 
 
 FROM debian:stable-slim
 ARG BITCOIN_USER_ID
 ARG GROUP_ID
-COPY --from=build /tmp/bitcoin/src/bitcoind /usr/local/bin/bitcoind
-RUN addgroup --gid ${GROUP_ID} bitcoin \
+
+COPY --from=build /tmp/bitcoin/build/bin/bitcoind /usr/local/bin/bitcoind
+
+RUN apt-get update \
+  && apt-get install -y --no-install-recommends adduser \
+  && rm -rf /var/lib/apt/lists/* \
+  && addgroup --gid ${GROUP_ID} bitcoin \
   && adduser -u ${BITCOIN_USER_ID} --disabled-password --gecos "" --ingroup bitcoin bitcoin \
+  && apt-get remove -y adduser \
   && mkdir /home/bitcoin/.bitcoin \
   && chown bitcoin:bitcoin /home/bitcoin/.bitcoin
 

btcrpcexplorer/Dockerfile

@@ -1,26 +1,29 @@
-FROM alpine:3.18 AS build
+FROM alpine:3.23 AS build
 ARG BTC_RPC_EXPLORER_VERSION
-RUN apk add --update --no-cache git gpg gpg-agent nodejs npm python3 wget \
+
+RUN apk add --update --no-cache curl git gpg gpg-agent nodejs npm python3 \
   && cd /opt \
-  && wget -O - https://keybase.io/danjanosik/pgp_keys.asc | gpg --import \
+  && curl -fsSL https://keybase.io/danjanosik/pgp_keys.asc > keys.asc \
+  && gpg --import keys.asc \
   && git clone --branch v${BTC_RPC_EXPLORER_VERSION} https://github.com/janoside/btc-rpc-explorer.git \
   && cd btc-rpc-explorer \
 #  && git verify-tag v${BTC_RPC_EXPLORER_VERSION} \ FIXME: not working. Requested to btc-rpc-explorer developers
   && npm install \
-  && chmod 755 -R . \
-  && apk del git gpg gpg-agent nodejs npm python3 wget
+  && chmod 755 -R .
 
 
 FROM node:22-slim
 ARG BTC_RPC_EXPLORER_USER_ID
 ARG GROUP_ID
-COPY --from=build /opt/btc-rpc-explorer /opt/btc-rpc-explorer
+
+COPY --from=build /opt/btc-rpc-explorer /opt/btcrpcexplorer
+
 RUN addgroup --gid $GROUP_ID btcrpcexplorer \
   && adduser -u ${BTC_RPC_EXPLORER_USER_ID} --disabled-password --gecos "" --ingroup btcrpcexplorer btcrpcexplorer \
   && mkdir /home/btcrpcexplorer/.config \
-  && chown btcrpcexplorer:btcrpcexplorer /home/btcrpcexplorer/.config \
-  && cd /opt/btc-rpc-explorer
+  && chown btcrpcexplorer:btcrpcexplorer /home/btcrpcexplorer/.config
 
+WORKDIR /opt/btcrpcexplorer
 USER btcrpcexplorer
 
-CMD cd /opt/btc-rpc-explorer && npm start
+CMD npm start

docker-compose.yml

@@ -10,9 +10,6 @@ services:
     volumes:
       - $TOR_DATA:/home/tor
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: 172.18.0.2
   i2p:
     image: i2p:$I2P_VERSION
     profiles:
@@ -25,34 +22,27 @@ services:
         - GROUP_ID=$SHARED_GID
     volumes:
       - $I2P_DATA:/i2p/.i2p
-    environment:
-      - EXT_PORT:7656
     ports:
       - 7657:7657
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: 172.18.0.3
-  bitcoind:
-    image: bitcoind:$BITCOIN_VERSION
+  bitcoin:
+    image: bitcoin:$BITCOIN_VERSION
     depends_on:
       - tor
+      # - i2p
     build:
-      context: ./bitcoind
+      context: ./bitcoin
       args:
         - BITCOIN_VERSION=$BITCOIN_VERSION
         - BITCOIN_USER_ID=$BITCOIN_USER_ID
         - GROUP_ID=$SHARED_GID
     volumes:
       - $BITCOIN_DATA:/home/bitcoin/.bitcoin
     restart: unless-stopped
-    networks:
-      default:
-        ipv4_address: 172.18.0.4
   electrs:
     image: electrs:$ELECTRS_VERSION
     depends_on:
-      - bitcoind
+      - bitcoin
     build:
       context: ./electrs
       args:
@@ -63,13 +53,10 @@ services:
       - $BITCOIN_DATA:/home/electrs/.bitcoin
       - $ELECTRS_DATA:/home/electrs/.electrs
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: 172.18.0.5
   btcrpcexplorer:
     image: btcrpcexplorer:$BTC_RPC_EXPLORER_VERSION
     depends_on:
-      - bitcoind
+      - bitcoin
       - electrs
     build:
       context: ./btcrpcexplorer
@@ -80,9 +67,6 @@ services:
     volumes:
       - $BTC_RPC_EXPLORER_DATA:/home/btcrpcexplorer/.config
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: 172.18.0.6
   nginx:
     image: nginx:alpine-slim
     depends_on:
@@ -94,13 +78,3 @@ services:
     volumes:
       - $NGINX_DATA:/etc/nginx
     restart: on-failure
-    networks:
-      default:
-        ipv4_address: 172.18.0.7
-
-networks:
-  default:
-    ipam:
-      config:
-        - subnet: 172.18.0.0/16
-          gateway: 172.18.0.1