From 655484b1ef7d3be7feb5b0edf3809e153f358f83 Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:12:10 +0100 Subject: [PATCH 1/6] update python to 3.8 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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"] -- 2.25.1 From 882801977256ed36f3b65308059fe6707250bd61 Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:13:23 +0100 Subject: [PATCH 2/6] fix typo backend_backend -> backend --- asgi.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- 2.25.1 From cf14f9f64f125bfdd233faf32c7caf93f20d5121 Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:14:14 +0100 Subject: [PATCH 3/6] drop unnecessary command: --- docker-compose.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 57ecb1c..8c9e69f 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: -- 2.25.1 From f4f3be10da00eeb18078b0f5aab7c3e21fe88b68 Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:14:41 +0100 Subject: [PATCH 4/6] don't start backend container before redis --- docker-compose.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 8c9e69f..d1b2442 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -11,6 +11,8 @@ services: restart: always feather-ws: container_name: feather-ws + depends_on: + - redis build: context: . dockerfile: Dockerfile -- 2.25.1 From 294df039aa81f27ff818d1244e8197caf82f05eb Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:15:49 +0100 Subject: [PATCH 5/6] drop unnecessary redis:// and socks5:// --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d1b2442..087f10a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,8 +19,8 @@ services: 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 -- 2.25.1 From 92b1dff620d48a60380ecfe5cf173a072cb29d6d Mon Sep 17 00:00:00 2001 From: terrydavis Date: Thu, 22 Feb 2024 19:16:03 +0100 Subject: [PATCH 6/6] replace aioredis with redis --- requirements.txt | 2 +- wowlet_backend/factory.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 -- 2.25.1