From 7dcf01112c0cb045d8b5a46f4542dc9474ced3e1 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sat, 25 Jun 2022 12:26:45 -0700 Subject: [PATCH 1/2] Add i2p container --- .gitignore | 3 +++ docker-compose.yml | 13 +++++++++++++ 2 files changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index af137525..c4e2ce0c 100755 --- a/.gitignore +++ b/.gitignore @@ -644,6 +644,9 @@ django # Postgres db +# docker +docker/i2p + # robosats frontend/static/assets/avatars* api/lightning/lightning* diff --git a/docker-compose.yml b/docker-compose.yml index 6bfd90fd..3fb570a9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -90,6 +90,15 @@ services: - /mnt/development/lnd:/lnd network_mode: service:tor + i2p: + image: geti2p/i2p + container_name: i2p-dev + volumes: + - ./docker/i2p/i2pconfig:/i2p/.i2p + - ./docker/i2p/i2ptorrents:/i2psnark + restart: unless-stopped + network_mode: service:tor + tor: build: ./docker/tor container_name: tor-dev @@ -102,6 +111,10 @@ services: - /mnt/development/tor/config:/etc/tor ports: - 8000:8000 + - 4444:4444 + # - 8215:12345 + - 7658:7658 + - 8001:7657 lnd: build: ./docker/lnd From 65f781af43288e299338d4b4a08fc669fbd91b82 Mon Sep 17 00:00:00 2001 From: Reckless_Satoshi Date: Sun, 26 Jun 2022 15:43:57 -0700 Subject: [PATCH 2/2] functional, but chat does not send messages (it does receive) --- .env-sample | 2 ++ docker-compose.yml | 8 +------- robosats/settings.py | 2 ++ 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.env-sample b/.env-sample index 62c445ab..7d9e3eb2 100644 --- a/.env-sample +++ b/.env-sample @@ -28,6 +28,8 @@ MARKET_PRICE_APIS = https://blockchain.info/ticker, https://api.yadio.io/exrates # Host e.g. robosats.com HOST_NAME = '' HOST_NAME2 = '' +I2P_ALIAS = '' +I2P_LONG = '' LOCAL_ALIAS = '' # SECURITY WARNING: keep the secret key used in production secret! diff --git a/docker-compose.yml b/docker-compose.yml index 3fb570a9..500ce8f5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,11 +93,9 @@ services: i2p: image: geti2p/i2p container_name: i2p-dev + network_mode: host volumes: - ./docker/i2p/i2pconfig:/i2p/.i2p - - ./docker/i2p/i2ptorrents:/i2psnark - restart: unless-stopped - network_mode: service:tor tor: build: ./docker/tor @@ -111,10 +109,6 @@ services: - /mnt/development/tor/config:/etc/tor ports: - 8000:8000 - - 4444:4444 - # - 8215:12345 - - 7658:7658 - - 8001:7657 lnd: build: ./docker/lnd diff --git a/robosats/settings.py b/robosats/settings.py index 9d739747..8390d756 100644 --- a/robosats/settings.py +++ b/robosats/settings.py @@ -39,6 +39,8 @@ AVATAR_ROOT = STATIC_ROOT + "assets/avatars/" ALLOWED_HOSTS = [ config("HOST_NAME"), config("HOST_NAME2"), + config("I2P_ALIAS"), + config("I2P_LONG"), config("LOCAL_ALIAS"), "127.0.0.1", ]