From 006d15137c3758cb19c67108d106f8faf9b93e57 Mon Sep 17 00:00:00 2001 From: Guillermo Rodriguez Date: Sat, 3 Jun 2023 12:44:22 -0300 Subject: [PATCH] Updated ipfs remote and ipfs launch logic --- skynet/cli.py | 8 ++++---- skynet/constants.py | 2 ++ skynet/ipfs.py | 6 +++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/skynet/cli.py b/skynet/cli.py index 8270b20..19bda68 100644 --- a/skynet/cli.py +++ b/skynet/cli.py @@ -316,7 +316,7 @@ def nodeos(): @click.option( '--node-url', '-n', default='https://skynet.ancap.tech') @click.option( - '--ipfs-url', '-n', default='/ip4/169.197.140.154/udp/4001/quic/p2p/12D3KooWKWogLFNEcNNMKnzU7Snrnuj84RZdMBg3sLiQSQc51oEv') + '--ipfs-url', '-n', default=DEFAULT_IPFS_REMOTE) @click.option( '--algos', '-A', default=json.dumps(['midj', 'ink'])) def dgpu( @@ -354,11 +354,11 @@ def dgpu( @click.option( '--key', '-k', default=None) @click.option( - '--hyperion-url', '-n', default='https://skynet.ancap.tech') + '--hyperion-url', '-y', default='https://skynet.ancap.tech') @click.option( '--node-url', '-n', default='https://skynet.ancap.tech') @click.option( - '--ipfs-url', '-n', default='/ip4/169.197.140.154/udp/4001/quic/p2p/12D3KooWKWogLFNEcNNMKnzU7Snrnuj84RZdMBg3sLiQSQc51oEv') + '--ipfs-url', '-i', default=DEFAULT_IPFS_REMOTE) @click.option( '--db-host', '-h', default='localhost:5432') @click.option( @@ -427,7 +427,7 @@ def ipfs(loglevel, name): @click.option( '--ipfs-rpc', '-i', default='http://127.0.0.1:5001') @click.option( - '--hyperion-url', '-n', default='http://127.0.0.1:42001') + '--hyperion-url', '-y', default='http://127.0.0.1:42001') def pinner(loglevel, ipfs_rpc, hyperion_url): logging.basicConfig(level=loglevel) ipfs_node = IPFSHTTP(ipfs_rpc) diff --git a/skynet/constants.py b/skynet/constants.py index 486edd3..74fed5d 100644 --- a/skynet/constants.py +++ b/skynet/constants.py @@ -130,3 +130,5 @@ CONFIG_ATTRS = [ 'strength', 'upscaler' ] + +DEFAULT_IPFS_REMOTE = '/ip4/169.197.140.154/tcp/4001/p2p/12D3KooWKWogLFNEcNNMKnzU7Snrnuj84RZdMBg3sLiQSQc51oEv' diff --git a/skynet/ipfs.py b/skynet/ipfs.py index 79322be..1c2bd87 100644 --- a/skynet/ipfs.py +++ b/skynet/ipfs.py @@ -86,13 +86,17 @@ def open_ipfs_node(name='skynet-ipfs'): Mount(export_target, str(staging_dir), 'bind'), Mount(data_target, str(data_dir), 'bind') ], - detach=True + detach=True, + remove=True ) + uid = os.getuid() gid = os.getgid() ec, out = container.exec_run(['chown', f'{uid}:{gid}', '-R', export_target]) + logging.info(out) assert ec == 0 ec, out = container.exec_run(['chown', f'{uid}:{gid}', '-R', data_target]) + logging.info(out) assert ec == 0 for log in container.logs(stream=True):