Update services

Author: evehash

.env.example

@@ -19,7 +19,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.11.0
+I2P_VERSION=2.12.0
 
 # User identifier used for i2p inside the container.
 I2P_USER_ID=1099

README.md

@@ -34,7 +34,7 @@ The stack is designed for users who want transparent local builds instead of pul
 | [Electrs](https://github.com/romanz/electrs) | Serves Electrum-compatible wallets from your own node. | 0.11.1 | ![Electrs version status](https://img.shields.io/endpoint?url=https%3A%2F%2Fevehash.github.io%2Fbitcoin-full-node-with-docker%2Fversion-status%2Felectrs.json) |
 | [BTC RPC Explorer](https://github.com/janoside/btc-rpc-explorer) | Provides a local Bitcoin blockchain explorer backed by your node. | 3.5.1 | ![BTC RPC Explorer version status](https://img.shields.io/endpoint?url=https%3A%2F%2Fevehash.github.io%2Fbitcoin-full-node-with-docker%2Fversion-status%2Fbtcrpcexplorer.json) |
 | [NGINX](https://github.com/nginxinc/docker-nginx) | Terminates local TLS for BTC RPC Explorer and Electrs. | stable-slim | ![NGINX version status](https://img.shields.io/endpoint?url=https%3A%2F%2Fevehash.github.io%2Fbitcoin-full-node-with-docker%2Fversion-status%2Fnginx.json) |
-| [I2P](https://github.com/i2p/i2p.i2p) | Optional additional privacy network for advanced users. | 2.11.0 | ![I2P version status](https://img.shields.io/endpoint?url=https%3A%2F%2Fevehash.github.io%2Fbitcoin-full-node-with-docker%2Fversion-status%2Fi2p.json) |
+| [I2P](https://github.com/i2p/i2p.i2p) | Optional additional privacy network for advanced users. | 2.12.0 | ![I2P version status](https://img.shields.io/endpoint?url=https%3A%2F%2Fevehash.github.io%2Fbitcoin-full-node-with-docker%2Fversion-status%2Fi2p.json) |
 
 Version status badges are generated weekly. `current` means the pinned version matches the latest stable upstream tag; `new release` means a newer upstream tag is available for review.
 

UPDATING_SERVICES.md

@@ -51,4 +51,4 @@ In case that something goes wrong during this process, it can be for two reasons
 
 In both cases, you can go back to the previous version that was working before. So simply revert the steps: put the previous version back in the `.env` file and re-run the service. The container you had previously will be deployed and everything should work again.
 
-In the meantime, you can open a thread in the [Discussions](https://github.com/reverse-hash/bitcoin-full-node-with-docker/discussions) section so we can help you.
+In the meantime, you can open a thread in the [Discussions](https://github.com/evehash/bitcoin-full-node-with-docker/discussions) section so we can help you.

docker-compose.yml

@@ -34,6 +34,9 @@ services:
         I2P_VERSION: ${I2P_VERSION}
         I2P_USER_ID: ${I2P_USER_ID}
         GROUP_ID: ${SHARED_GID}
+    environment:
+      JVM_XMX: "512m"
+      EXT_PORT: "12345"
     ports:
       - "7657:7657"
     volumes:
@@ -42,7 +45,8 @@ services:
     restart: on-failure
     stop_grace_period: 2m
     healthcheck:
-      test: ["CMD", "nc", "-z", "127.0.0.1", "7656"]
+      # I2P rewrites client binds to the container IP, so check the same SAM endpoint Bitcoin uses.
+      test: ["CMD", "nc", "-z", "i2p", "7656"]
       interval: 30s
       timeout: 5s
       retries: 10

i2p/Dockerfile

@@ -5,23 +5,30 @@ ARG I2P_VERSION
 # Install build dependencies only in the builder stage.
 RUN apk add --no-cache \
       apache-ant \
-      bzip2 \
+      curl \
       gettext \
+      git \
       gpg \
-      gpg-agent \
-      wget
+      gpg-agent
 
 WORKDIR /opt
 
-# Download and verify the upstream source archive before building.
-RUN wget https://github.com/i2p/i2p.i2p/releases/download/i2p-${I2P_VERSION}/i2psource_${I2P_VERSION}.tar.bz2 \
-  && wget https://github.com/i2p/i2p.i2p/releases/download/i2p-${I2P_VERSION}/i2psource_${I2P_VERSION}.tar.bz2.sig \
-  && wget -O - https://geti2p.net/_static/idk.key.asc | gpg --import \
-  && gpg --verify i2psource_${I2P_VERSION}.tar.bz2.sig
+# Import I2P release signing keys before verifying the upstream release tag.
+RUN curl -fsSL https://i2p.net/zzz.key.asc | gpg --batch --import \
+  && curl -fsSL https://i2p.net/idk.key.asc | gpg --batch --import \
+  && gpgconf --kill all
+
+# Clone and verify the upstream release tag before building.
+RUN git clone \
+      --depth 1 \
+      --branch "i2p-${I2P_VERSION}" \
+      https://github.com/i2p/i2p.i2p.git \
+      "i2p-${I2P_VERSION}" \
+  && cd "i2p-${I2P_VERSION}" \
+  && git verify-tag "i2p-${I2P_VERSION}"
 
 # Build the Linux package layout copied into the runtime image.
-RUN tar -xvf i2psource_${I2P_VERSION}.tar.bz2 \
-  && cd i2p-${I2P_VERSION} \
+RUN cd i2p-${I2P_VERSION} \
   && ant preppkg-linux-only
 
 

volumes/nginx/nginx.conf

@@ -16,7 +16,6 @@ http {
 }
 
 stream {
-
   ssl_certificate certificate.crt;
   ssl_certificate_key certificate.key;
   ssl_session_cache shared:SSL1:1m;
@@ -41,5 +40,4 @@ stream {
     listen 50002 ssl;
     proxy_pass electrs;
   }
-
 }

volumes/tor/torrc.default

@@ -1,4 +1,5 @@
 # Socks listen port
+SocksPort 127.0.0.1:9050
 SocksPort tor:9050
 
 # Uncomment to expose Bitcoin Explorer as an Onion Service