Fix Azamat's docker-compose.yaml

README.md

@@ -1,2 +1,2 @@
-# CalendarIT
+# YetAnotherCalendar
 

backend/README.md

@@ -1,6 +1,5 @@
-# CalendarIT
-Project template for [BlackSheep](https://github.com/Neoteroi/BlackSheep)
-web framework to start Web APIs.
+# YetAnotherCalendar
+This project is created to replace Modeus/Netology calendars
 
 ## Getting started
 
@@ -15,7 +14,7 @@ curl -sSL https://install.python-poetry.org | python3 -
 
 poetry install
 
-poetry run python dev.py
+poetry run python -m yet_another_calendar
 ```
 
 ### Running with Docker Compose
@@ -30,4 +29,4 @@ If code was changed, rebuild images:
 docker compose up --build -d
 ```
 
-### Open [OpenAPI](http://localhost:44777/docs)
+### Open [OpenAPI](http://localhost:8000/api/docs)

backend/pyproject.toml

@@ -24,6 +24,10 @@ httptools = "^0.6.1"
 pymongo = "^4.8.0"
 loguru = "^0"
 mypy = "^1.11.2"
+environs = "^11.0.0"
+beautifulsoup4 = "^4.12.3"
+lxml = "^5.3.0"
+httpx = {extras = ["http2"], version = "^0.27.2"}
 
 
 [tool.poetry.group.dev.dependencies]

backend/yet_another_calendar/settings.py

@@ -36,7 +36,7 @@ class Settings(BaseSettings):
     # quantity of workers for uvicorn
     workers_count: int = 1
     # Enable uvicorn reloading
-    reload: bool = True
+    reload: bool = env.bool("YET_ANOTHER_CALENDAR_RELOAD", False)
 
     # Current environment
     environment: str = "dev"

docker-compose.yaml

@@ -1,24 +1,41 @@
 services:
-  backend:
+  api: &main_app
+    ports:
+      - "8000:8000"
     build:
-      context: ./backend
-    container_name: calendar-backend
+      context: backend/
+      dockerfile: Dockerfile
+    image: yet_another_calendar:${YET_ANOTHER_CALENDAR_VERSION:-latest}
     restart: always
-    environment:
-      APP_HOST: "0.0.0.0"
-      APP_PORT: "8000"
     volumes:
-      - ./backend:/app/
-    ports:
-      - "127.0.0.1:8000:8000"
+      - ./backend:/app/src/
     env_file:
       - backend/.env
+    depends_on:
+      redis:
+        condition: service_healthy
+    environment:
+      YET_ANOTHER_CALENDAR_HOST: 0.0.0.0
+      YET_ANOTHER_CALENDAR_REDIS_HOST: yet_another_calendar-redis
+      YET_ANOTHER_CALENDAR_RELOAD: "True"
+
+  redis:
+    image: redis:latest
+    hostname: "yet_another_calendar-redis"
+    restart: always
+    environment:
+      ALLOW_EMPTY_PASSWORD: "yes"
+    healthcheck:
+      test: redis-cli ping
+      interval: 1s
+      timeout: 3s
+      retries: 50
 
   frontend:
     build:
       context: ./frontend
     container_name: calendar-frontend
     restart: always
     ports:
-      - 3000:80
+      - "3000:80"