diff --git a/.gitignore b/.gitignore index 058c5b9..2006843 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ __pycache__/ venv/ .env test.py +celerybeat-schedule.db diff --git a/README.md b/README.md index a01897d..00b9d39 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,14 @@ Support Group - Telegram
* 2 - Setting up environment variables - ```cp .env.dist .env``` * 3 - RUN Project the following commands - - ```make setup``` + - ```make run.image``` - run with docker +* 4 - Run the following commands without docker + - ```python3 -m venv venv``` + - ```source venv/bin/activate``` or ```./venv/scripts/activate``` + - ```pip3 install -r requirements.txt``` + - ```uvicorn main:app --port ${SERVICE_PORT}``` run bot + - ```celery -A app.bot.services.external.celery.tasks worker -l INFO``` run celery worker + - ```celery -A app.bot.services.external.celery.tasks beat -l INFO``` run celery beat ## Technologies Used diff --git a/docker-compose.yml b/docker-compose.yml index 77992e5..11b8aec 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,12 +18,17 @@ services: redis: image: redis:latest container_name: redis + ports: + - 6379:6379 volumes: - redis_data:/data db: image: postgres:14 container_name: postgres_db + ports: + - 5432:5432 + environment: POSTGRES_DB: ${DB_NAME} POSTGRES_USER: ${DB_USERNAME} diff --git a/makefile b/makefile index 9ad5966..ade63c4 100644 --- a/makefile +++ b/makefile @@ -1,6 +1,15 @@ -setup: +run.image: docker-compose down docker-compose up --build +run.bot: + uvicorn main:app --port ${SERVICE_PORT} --host 0.0.0.0 + +run.celery.worker: + celery -A app.bot.services.external.celery.tasks worker --loglevel=info --concurrency=1 --queues=example_queue + +run.celery.beat: + celery -A app.bot.services.external.celery.tasks beat -l INFO + logs: docker-compose logs