From 7b4df1586f4e0888db58d44c7f0faa10f204b59e Mon Sep 17 00:00:00 2001
From: Alva Swanson <alvasw@protonmail.com>
Date: Thu, 12 Oct 2023 19:02:39 +0200
Subject: [PATCH] seednode-docker: Add bitcoind container

---
 seednode/deployment_v2/docker/.env            |  6 ++--
 .../deployment_v2/docker/docker-compose.yml   | 33 +++++++++++++++++--
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/seednode/deployment_v2/docker/.env b/seednode/deployment_v2/docker/.env
index 95692e4cdc..f8b217513e 100644
--- a/seednode/deployment_v2/docker/.env
+++ b/seednode/deployment_v2/docker/.env
@@ -2,13 +2,13 @@
 JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError
 
 # bitcoin p2p settings
-BITCOIN_P2P_HOST=host.docker.internal
+BITCOIN_P2P_HOST=bisq-bitcoind
 BITCOIN_P2P_PORT=8333
 
 # bitcoind rpc ports
-BITCOIN_RPC_HOST=host.docker.internal
+BITCOIN_RPC_HOST=bisq-bitcoind
 BITCOIN_RPC_PORT=8332
-BITCOIN_RPC_BLOCKNOTIFY_HOST=host.docker.internal
+BITCOIN_RPC_BLOCKNOTIFY_HOST=bisq-bitcoind
 BITCOIN_RPC_BLOCKNOTIFY_PORT=5120
 
 BITCOIN_RPC_USER=bisq
diff --git a/seednode/deployment_v2/docker/docker-compose.yml b/seednode/deployment_v2/docker/docker-compose.yml
index 8e28681a35..7288caea3d 100644
--- a/seednode/deployment_v2/docker/docker-compose.yml
+++ b/seednode/deployment_v2/docker/docker-compose.yml
@@ -1,8 +1,37 @@
 version: '3.7'
 
 services:
+    bisq-bitcoind:
+        image: bisq/bitcoind:latest
+        deploy:
+            replicas: 1
+            restart_policy:
+                condition: any
+        ports:
+            - 8333:8333 # bitcoind port
+        volumes:
+            - ./bitcoind_data_dir:/root/.bitcoin
+        command:
+            - -server=1
+            - -listen=1
+            - -discover=1
+            - -txindex=1
+            - -dbcache=1337
+            - -maxconnections=1337
+            - -peerbloomfilters=1
+            - -onion=bisq-tor:9050
+            - -rpcallowip=127.0.0.1
+            - -rpcallowip=172.0.0.1/8 # Docker IP range
+            - -rpcuser=${BITCOIN_RPC_USER}
+            - -rpcpassword=${BITCOIN_RPC_PASS}
+            - -blocknotify=/root/.bitcoin/blocknotify.sh %s
+            - -bind=0.0.0.0:${BITCOIN_RPC_PORT}
+            - -rpcbind=0.0.0.0:${BITCOIN_RPC_PORT}
+
     bisq-seednode:
         image: bisq/seednode:latest
+        depends_on:
+            - bisq-bitcoind
         deploy:
             replicas: 1
             restart_policy:
@@ -13,7 +42,7 @@ services:
             - ${BISQ_NODE_PORT}:${BISQ_NODE_PORT} # bisq node port
             - 127.0.0.1:5120:5120 # bitcoind rpc block notifications
         volumes:
-            - bisq_data:/bisq/bisq-seednode
+            - bisq_seednode_data:/bisq/bisq-seednode
         command:
             - --fullDaoNode=${BISQ_DAO_FULLNODE}
             - --userDataDir=${BISQ_HOME}
@@ -53,5 +82,5 @@ services:
                    "--AvoidDiskWrites", "1" ]
 
 volumes:
-    bisq_data:
+    bisq_seednode_data:
     tor_data: