diff --git a/Dockerfile b/Dockerfile index 8e26cc1..2d6843e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.7 +FROM python:3.8 WORKDIR /app COPY requirements.txt . @@ -7,4 +7,4 @@ RUN pip install -r requirements.txt COPY . . EXPOSE 1337 -CMD ["hypercorn", "--access-logfile", "-", "--workers", "1", "--bind", "0.0.0.0:1337", "asgi:app"] \ No newline at end of file +CMD ["hypercorn", "--access-logfile", "-", "--workers", "1", "--bind", "0.0.0.0:1337", "asgi:app"] diff --git a/asgi.py b/asgi.py index 4d49d01..b770c8c 100644 --- a/asgi.py +++ b/asgi.py @@ -2,5 +2,5 @@ # Copyright (c) 2020, The Monero Project. # Copyright (c) 2020, dsc@xmr.pm -from wowlet_backend_backend.factory import create_app +from wowlet_backend.factory import create_app app = create_app() diff --git a/docker-compose.yml b/docker-compose.yml index 57ecb1c..087f10a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,7 +4,6 @@ services: redis: container_name: redis image: "redis:alpine" - command: redis-server environment: - REDIS_REPLICATION_MODE=master tor-node: @@ -12,14 +11,16 @@ services: restart: always feather-ws: container_name: feather-ws + depends_on: + - redis build: context: . dockerfile: Dockerfile environment: - WOWLET_DEBUG=false - WOWLET_PORT=1337 - - WOWLET_REDIS_ADDRESS=redis://redis - - WOWLET_TOR_SOCKS_PROXY=socks5://tor-node:9050 + - WOWLET_REDIS_HOST=redis + - WOWLET_TOR_SOCKS_PROXY=tor-node:9050 - WOWLET_COIN_NAME=monero - WOWLET_COIN_SYMBOL=xmr - WOWLET_COIN_MODE=mainnet diff --git a/requirements.txt b/requirements.txt index fb038a9..b5bc14a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ quart -aioredis>=2.0.0 +redis>=4.2.0rc1 aiohttp aiofiles quart_session diff --git a/wowlet_backend/factory.py b/wowlet_backend/factory.py index db64261..f4e8ba6 100644 --- a/wowlet_backend/factory.py +++ b/wowlet_backend/factory.py @@ -10,7 +10,7 @@ from datetime import datetime from asyncio_multisubscriber_queue import MultisubscriberQueue from quart import Quart from quart_session import Session -import aioredis +from redis import asyncio as aioredis from wowlet_backend.utils import print_banner import settings