diff --git a/.env b/.env deleted file mode 100644 index e3670dc..0000000 --- a/.env +++ /dev/null @@ -1,3 +0,0 @@ -PG_USER=pg -PG_PASS=pg -PG_OUTBOUND_PORT=5432 \ No newline at end of file diff --git a/.env.sample b/.env.sample new file mode 100644 index 0000000..70b3734 --- /dev/null +++ b/.env.sample @@ -0,0 +1,5 @@ +PG_USER=pg +PG_PASS= +PG_OUTBOUND_PORT=5432 +GROUP_ID= +TOKEN= \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..f1831c1 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,21 @@ +FROM python:3.9 + +ENV DB_ADDR localhost:5432 +ENV GROUP_ID group_id +ENV NFT_ADDR http://localhost:5001 +ENV PASS pg +ENV REDIS_ADDR localhost +ENV TMP_DIR ./tmp +ENV TOKEN token + +WORKDIR /app + +RUN mkdir -p /app/tmp + +COPY ./requirements.txt /app/requirements.txt + +RUN pip install --no-cache-dir --upgrade -r /app/requirements.txt + +COPY . /app + +CMD ["python3", "main.py"] diff --git a/docker-compose.yml b/docker-compose.yml index 6147790..e246059 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,6 +7,24 @@ services: ports: - 5001:5000 + bot: + build: + context: . + dockerfile: Dockerfile + environment: + - DB_ADDR=pgdb:5432 + - GROUP_ID=${GROUP_ID} + - NFT_ADDR=http://image_gen:5001 + - PASS=${PG_PASS} + - REDIS_ADDR=redis + - TMP_DIR=./tmp + - TOKEN=${TOKEN} + - USER=${PG_USER} + depends_on: + - pgdb + - redis + - image_gen + pgdb: image: 'postgres:12' restart: always @@ -17,12 +35,12 @@ services: - PGDATA=/var/lib/postgresql/data/pgdata # volumes: # - ${PG_MNT}:/var/lib/postgresql/data - ports: - - ${PG_OUTBOUND_PORT}:5432 +# ports: +# - ${PG_OUTBOUND_PORT}:5432 redis: image: "redis:alpine" command: redis-server --appendonly yes --appendfsync everysec - ports: - - 6379:6379 +# ports: +# - 6379:6379 # volumes: # - ${FDS_REDIS_MNT}:/data diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..56bf984 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,9 @@ +sqlalchemy~=1.4.36 +redis~=3.5.3 +vkwave~=0.2.16 +matplotlib~=3.5.1 +numpy~=1.21.2 +pillow~=9.0.1 +flask~=1.1.2 +requests~=2.25.1 +psycopg2 \ No newline at end of file diff --git a/util/nft_util.py b/util/nft_util.py index 365d5f0..1abdee2 100644 --- a/util/nft_util.py +++ b/util/nft_util.py @@ -2,7 +2,7 @@ import base64 import logging import os -from sphinx.util import requests +import requests from config import Config