Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

dev(regtest): prepare 'wait-for-bitcoind' feature #559

Merged
merged 3 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions docker/regtest/docker-compose-common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ services:
dockerfile: Dockerfile
restart: unless-stopped
environment:
READY_FILE: /root/.regtest-initializer/btc_fully_synched
ENSURE_WALLET: "true"
REMOVE_LOCK_FILES: "true"
jm_blockchain_source: regtest
Expand All @@ -30,7 +29,6 @@ services:
dockerfile: Dockerfile
restart: unless-stopped
environment:
READY_FILE: /root/.regtest-initializer/btc_fully_synched
ENSURE_WALLET: "true"
REMOVE_LOCK_FILES: "true"
jm_blockchain_source: regtest
Expand Down
5 changes: 3 additions & 2 deletions docker/regtest/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ services:
file: docker-compose-common.yml
service: joinmarket_native
environment:
READY_FILE: /root/.regtest-initializer/btc_fully_synched
jm_rpc_wallet_file: jm_primary
jm_rpc_user: joinmarket
jm_rpc_password: joinmarket
Expand Down Expand Up @@ -39,10 +40,8 @@ services:
- "29183:28183" # exposed for "init setup" routine
volumes:
- "joinmarket2_datadir:/root/.joinmarket"
- "initializer_datadir:/root/.regtest-initializer"
depends_on:
- bitcoind
- bitcoind_regtest_initializer
- irc

joinmarket3:
Expand All @@ -51,6 +50,8 @@ services:
file: docker-compose-common.yml
service: joinmarket_jam_standalone
environment:
READY_FILE: /root/.regtest-initializer/btc_fully_synched
WAIT_FOR_BITCOIND: "false"
jm_rpc_wallet_file: jm_tertiary
jm_rpc_user: joinmarket3
jm_rpc_password: joinmarket3
Expand Down