From 1e5fe7a18948580412fc486e1b32c329bb59b0c4 Mon Sep 17 00:00:00 2001 From: Alva Swanson Date: Sun, 15 Oct 2023 17:26:24 +0200 Subject: [PATCH] Set seednode options with Docker Config --- seednode/deployment_v2/docker/.env | 33 --------------- .../deployment_v2/docker/docker-compose.yml | 39 +++++++---------- seednode/deployment_v2/docker/regtest/.env | 22 ---------- .../docker/regtest/docker-compose.yml | 42 +++++++------------ .../docker/regtest/seednode_1_config | 13 ++++++ .../docker/regtest/seednode_2_config | 13 ++++++ seednode/deployment_v2/docker/seednode_config | 19 +++++++++ 7 files changed, 75 insertions(+), 106 deletions(-) delete mode 100644 seednode/deployment_v2/docker/.env delete mode 100644 seednode/deployment_v2/docker/regtest/.env create mode 100644 seednode/deployment_v2/docker/regtest/seednode_1_config create mode 100644 seednode/deployment_v2/docker/regtest/seednode_2_config create mode 100644 seednode/deployment_v2/docker/seednode_config diff --git a/seednode/deployment_v2/docker/.env b/seednode/deployment_v2/docker/.env deleted file mode 100644 index f8b217513e..0000000000 --- a/seednode/deployment_v2/docker/.env +++ /dev/null @@ -1,33 +0,0 @@ -# java memory and remote management options -JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError - -# bitcoin p2p settings -BITCOIN_P2P_HOST=bisq-bitcoind -BITCOIN_P2P_PORT=8333 - -# bitcoind rpc ports -BITCOIN_RPC_HOST=bisq-bitcoind -BITCOIN_RPC_PORT=8332 -BITCOIN_RPC_BLOCKNOTIFY_HOST=bisq-bitcoind -BITCOIN_RPC_BLOCKNOTIFY_PORT=5120 - -BITCOIN_RPC_USER=bisq -BITCOIN_RPC_PASS=bisq - -# bisq pathnames -BISQ_HOME=/bisq -BISQ_APP_NAME=bisq-seednode - -BISQ_BASE_CURRENCY=btc_mainnet -BISQ_DAO_FULLNODE=true - -# bisq node settings -BISQ_NODE_PORT=8000 -BISQ_MAX_CONNECTIONS=20 -BISQ_MAX_MEMORY=4000 - -# set to true for BSQ explorer -BISQ_DUMP_BLOCKCHAIN=false - -# set to true for BSQ markets -BISQ_DUMP_STATISTICS=false diff --git a/seednode/deployment_v2/docker/docker-compose.yml b/seednode/deployment_v2/docker/docker-compose.yml index 7288caea3d..06a8331829 100644 --- a/seednode/deployment_v2/docker/docker-compose.yml +++ b/seednode/deployment_v2/docker/docker-compose.yml @@ -22,14 +22,18 @@ services: - -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} + - -rpcuser=bisq + - -rpcpassword=bisq - -blocknotify=/root/.bitcoin/blocknotify.sh %s - - -bind=0.0.0.0:${BITCOIN_RPC_PORT} - - -rpcbind=0.0.0.0:${BITCOIN_RPC_PORT} + - -bind=0.0.0.0:8332 + - -rpcbind=0.0.0.0:8332 bisq-seednode: image: bisq/seednode:latest + environment: + - JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError + configs: + - bisq_seednode_config depends_on: - bisq-bitcoind deploy: @@ -39,30 +43,11 @@ services: extra_hosts: - host.docker.internal:host-gateway ports: - - ${BISQ_NODE_PORT}:${BISQ_NODE_PORT} # bisq node port - - 127.0.0.1:5120:5120 # bitcoind rpc block notifications + - 8000:8000 # bisq node port volumes: - bisq_seednode_data:/bisq/bisq-seednode command: - - --fullDaoNode=${BISQ_DAO_FULLNODE} - - --userDataDir=${BISQ_HOME} - - --appName=${BISQ_APP_NAME} - - --baseCurrencyNetwork=${BISQ_BASE_CURRENCY} - - --maxConnections=${BISQ_MAX_CONNECTIONS} - - --maxMemory=${BISQ_MAX_MEMORY} - - --nodePort=${BISQ_NODE_PORT} - - --btcNodes=${BITCOIN_P2P_HOST}:${BITCOIN_P2P_PORT} - - --rpcBlockNotificationHost=${BITCOIN_RPC_BLOCKNOTIFY_HOST} - - --rpcBlockNotificationPort=${BITCOIN_RPC_BLOCKNOTIFY_PORT} - - --rpcHost=${BITCOIN_RPC_HOST} - - --rpcPort=${BITCOIN_RPC_PORT} - - --rpcUser=${BITCOIN_RPC_USER} - - --rpcPassword=${BITCOIN_RPC_PASS} - - --dumpBlockchainData=${BISQ_DUMP_BLOCKCHAIN} - - --dumpStatistics=${BISQ_DUMP_STATISTICS} - - --torControlHost=bisq-tor - - --torControlPort=9051 - - --torControlPassword=bisq + - --configFile=/bisq_seednode_config bisq-tor: image: bisq/tor:latest @@ -81,6 +66,10 @@ services: "--HiddenServiceStatistics", "0", "--AvoidDiskWrites", "1" ] +configs: + bisq_seednode_config: + file: ./seednode_config + volumes: bisq_seednode_data: tor_data: diff --git a/seednode/deployment_v2/docker/regtest/.env b/seednode/deployment_v2/docker/regtest/.env deleted file mode 100644 index aff2512d5a..0000000000 --- a/seednode/deployment_v2/docker/regtest/.env +++ /dev/null @@ -1,22 +0,0 @@ -# java memory and remote management options -JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError - -# bitcoin p2p settings -BITCOIN_P2P_HOST=bisq-bitcoind -BITCOIN_P2P_PORT=18444 - -# bitcoind rpc ports -BITCOIN_RPC_HOST=bisq-bitcoind -BITCOIN_RPC_PORT=18443 -BITCOIN_RPC_BLOCKNOTIFY_HOST=0.0.0.0 -BITCOIN_RPC_BLOCKNOTIFY_PORT=5120 - -BITCOIN_RPC_USER=bisqdao -BITCOIN_RPC_PASS=bsq - -# bisq pathnames -BISQ_HOME=/bisq -BISQ_APP_NAME=bisq-seednode - -BISQ_BASE_CURRENCY=BTC_REGTEST -BISQ_DAO_FULLNODE=true diff --git a/seednode/deployment_v2/docker/regtest/docker-compose.yml b/seednode/deployment_v2/docker/regtest/docker-compose.yml index 67cf8e3c0f..2405c496bf 100644 --- a/seednode/deployment_v2/docker/regtest/docker-compose.yml +++ b/seednode/deployment_v2/docker/regtest/docker-compose.yml @@ -25,6 +25,10 @@ services: bisq-seednode-1: image: bisq/seednode:latest + environment: + - JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError + configs: + - bisq_seednode_1_config depends_on: - bisq-bitcoind extra_hosts: @@ -35,22 +39,14 @@ services: volumes: - bisq_seednode_1_data:/bisq/bisq-seednode command: - - --baseCurrencyNetwork=${BISQ_BASE_CURRENCY} - - --useLocalhostForP2P=true - - --useDevPrivilegeKeys=true - - --fullDaoNode=${BISQ_DAO_FULLNODE} - - --btcNodes=${BITCOIN_P2P_HOST}:${BITCOIN_P2P_PORT} - - --rpcHost=${BITCOIN_RPC_HOST} - - --rpcPort=${BITCOIN_RPC_PORT} - - --rpcUser=${BITCOIN_RPC_USER} - - --rpcPassword=${BITCOIN_RPC_PASS} - - --rpcBlockNotificationPort=5120 - - --nodePort=2002 - - --userDataDir=${BISQ_HOME} - - --appName=${BISQ_APP_NAME} + - --configFile=/bisq_seednode_1_config bisq-seednode-2: image: bisq/seednode:latest + environment: + - JDK_JAVA_OPTIONS=-Xms4096M -Xmx4096M -XX:+ExitOnOutOfMemoryError + configs: + - bisq_seednode_2_config depends_on: - bisq-bitcoind extra_hosts: @@ -61,19 +57,7 @@ services: volumes: - bisq_seednode_2_data:/bisq/bisq-seednode command: - - --baseCurrencyNetwork=${BISQ_BASE_CURRENCY} - - --useLocalhostForP2P=true - - --useDevPrivilegeKeys=true - - --fullDaoNode=${BISQ_DAO_FULLNODE} - - --btcNodes=${BITCOIN_P2P_HOST}:${BITCOIN_P2P_PORT} - - --rpcHost=${BITCOIN_RPC_HOST} - - --rpcPort=${BITCOIN_RPC_PORT} - - --rpcUser=${BITCOIN_RPC_USER} - - --rpcPassword=${BITCOIN_RPC_PASS} - - --rpcBlockNotificationPort=5121 - - --nodePort=3002 - - --userDataDir=${BISQ_HOME} - - --appName=${BISQ_APP_NAME} + - --configFile=/bisq_seednode_2_config bisq-tor: image: bisq/tor:latest @@ -88,6 +72,12 @@ services: "--HiddenServiceStatistics", "0", "--AvoidDiskWrites", "1" ] +configs: + bisq_seednode_1_config: + file: ./seednode_1_config + bisq_seednode_2_config: + file: ./seednode_2_config + volumes: bisq_seednode_1_data: bisq_seednode_2_data: diff --git a/seednode/deployment_v2/docker/regtest/seednode_1_config b/seednode/deployment_v2/docker/regtest/seednode_1_config new file mode 100644 index 0000000000..37a352de67 --- /dev/null +++ b/seednode/deployment_v2/docker/regtest/seednode_1_config @@ -0,0 +1,13 @@ +baseCurrencyNetwork=BTC_REGTEST +useLocalhostForP2P=true +useDevPrivilegeKeys=true +fullDaoNode=true +btcNodes=bisq-bitcoind:18444 +rpcHost=bisq-bitcoind +rpcPort=18443 +rpcUser=bisqdao +rpcPassword=bsq +rpcBlockNotificationPort=5120 +nodePort=2002 +userDataDir=/bisq +appName=bisq-seednode diff --git a/seednode/deployment_v2/docker/regtest/seednode_2_config b/seednode/deployment_v2/docker/regtest/seednode_2_config new file mode 100644 index 0000000000..b57fb9e3bc --- /dev/null +++ b/seednode/deployment_v2/docker/regtest/seednode_2_config @@ -0,0 +1,13 @@ +baseCurrencyNetwork=BTC_REGTEST +useLocalhostForP2P=true +useDevPrivilegeKeys=true +fullDaoNode=true +btcNodes=bisq-bitcoind:18444 +rpcHost=bisq-bitcoind +rpcPort=18443 +rpcUser=bisqdao +rpcPassword=bsq +rpcBlockNotificationPort=5121 +nodePort=3002 +userDataDir=/bisq +appName=bisq-seednode diff --git a/seednode/deployment_v2/docker/seednode_config b/seednode/deployment_v2/docker/seednode_config new file mode 100644 index 0000000000..27370c2758 --- /dev/null +++ b/seednode/deployment_v2/docker/seednode_config @@ -0,0 +1,19 @@ +fullDaoNode=true +userDataDir=/bisq +appName=bisq-seednode +baseCurrencyNetwork=btc_mainnet +maxConnections=20 +maxMemory=4000 +nodePort=8000 +btcNodes=bisq-bitcoind:8333 +rpcBlockNotificationHost=bisq-bitcoind +rpcBlockNotificationPort=5120 +rpcHost=bisq-bitcoind +rpcPort=8332 +rpcUser=bisq +rpcPassword=bisq +dumpBlockchainData=false +dumpStatistics=false +torControlHost=bisq-tor +torControlPort=9051 +torControlPassword=bisq