Ecosystem/basicswap
1
0
Fork 0
mirror of https://github.com/basicswap/basicswap.git synced 2024-12-23 03:49:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

doc: Add missing --usecontainers to docker notes.

Browse source
This commit is contained in:
tecnovert 2022-12-27 20:35:42 +02:00
parent c4321b7740
commit ac10c9db76
No known key found for this signature in database
GPG key ID: 8ED6D8750C4E3F93
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
bin/basicswap_prepare.py
View file

@ -735,8 +735,7 @@ def prepareDataDir(coin, settings, chain, particl_mnemonic, extra_opts={}):
if chain == 'testnet': if chain == 'testnet':
fp.write('testnet=1\n') fp.write('testnet=1\n')
config_datadir = data_dir config_datadir = data_dir
if core_settings['manage_daemon'] is False: if extra_opts.get('use_containers', False) is True:
# Assume conf file is for isolated coin docker setup
config_datadir = '/data' config_datadir = '/data'
fp.write(f'data-dir={config_datadir}\n') fp.write(f'data-dir={config_datadir}\n')
fp.write('rpc-bind-port={}\n'.format(core_settings['rpcport'])) fp.write('rpc-bind-port={}\n'.format(core_settings['rpcport']))
@ -761,16 +760,14 @@ def prepareDataDir(coin, settings, chain, particl_mnemonic, extra_opts={}):
if os.path.exists(wallet_conf_path): if os.path.exists(wallet_conf_path):
exitWithError('{} exists'.format(wallet_conf_path)) exitWithError('{} exists'.format(wallet_conf_path))
with open(wallet_conf_path, 'w') as fp: with open(wallet_conf_path, 'w') as fp:
config_datadir = os.path.join(data_dir, 'wallets')
if extra_opts.get('use_containers', False) is True: if extra_opts.get('use_containers', False) is True:
fp.write('daemon-address={}:{}\n'.format(core_settings['rpchost'], core_settings['rpcport'])) fp.write('daemon-address={}:{}\n'.format(core_settings['rpchost'], core_settings['rpcport']))
config_datadir = '/data'
fp.write('untrusted-daemon=1\n') fp.write('untrusted-daemon=1\n')
fp.write('no-dns=1\n') fp.write('no-dns=1\n')
fp.write('rpc-bind-port={}\n'.format(core_settings['walletrpcport'])) fp.write('rpc-bind-port={}\n'.format(core_settings['walletrpcport']))
fp.write('rpc-bind-ip={}\n'.format(COINS_RPCBIND_IP)) fp.write('rpc-bind-ip={}\n'.format(COINS_RPCBIND_IP))
config_datadir = os.path.join(data_dir, 'wallets')
if core_settings['manage_wallet_daemon'] is False:
# Assume conf file is for isolated coin docker setup
config_datadir = '/data'
fp.write(f'wallet-dir={config_datadir}\n') fp.write(f'wallet-dir={config_datadir}\n')
fp.write('log-file={}\n'.format(os.path.join(config_datadir, 'wallet.log'))) fp.write('log-file={}\n'.format(os.path.join(config_datadir, 'wallet.log')))
fp.write('shared-ringdb-dir={}\n'.format(os.path.join(config_datadir, 'shared-ringdb'))) fp.write('shared-ringdb-dir={}\n'.format(os.path.join(config_datadir, 'shared-ringdb')))

2
docker/production/notes.md
View file

@ -82,7 +82,7 @@ Create config files:
export WITH_COINS=bitcoin,litecoin,monero export WITH_COINS=bitcoin,litecoin,monero
docker-compose -f docker-compose-prepare.yml run --rm swapprepare \ docker-compose -f docker-compose-prepare.yml run --rm swapprepare \
basicswap-prepare --nocores --withcoins=${WITH_COINS} --htmlhost="0.0.0.0" --particl_mnemonic=none basicswap-prepare --nocores --usecontainers --withcoins=${WITH_COINS} --htmlhost="0.0.0.0" --particl_mnemonic=none
Start coin cores only: Start coin cores only: