From 1b090b5842097a739784a7ea2e5b60b42ee59c89 Mon Sep 17 00:00:00 2001 From: Illia Redka Date: Thu, 28 May 2026 19:30:05 +0300 Subject: [PATCH] Solution --- .dockerignore | 12 +++++++++ Dockerfile | 22 +++++++++++++++ cinema/management/__init__.py | 0 cinema/management/commands/__init__.py | 0 cinema/management/commands/wait_for_db.py | 23 ++++++++++++++++ cinema_service/settings.py | 11 +++++--- docker-compose.yml | 33 +++++++++++++++++++++++ requirements.txt | 1 + 8 files changed, 99 insertions(+), 3 deletions(-) create mode 100644 .dockerignore create mode 100644 Dockerfile create mode 100644 cinema/management/__init__.py create mode 100644 cinema/management/commands/__init__.py create mode 100644 cinema/management/commands/wait_for_db.py create mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..e592d8b0 --- /dev/null +++ b/.dockerignore @@ -0,0 +1,12 @@ +.idea/ +.vscode/ +*.iml +.env +.DS_Store +.gitignore +.git +venv/ +.pytest_cache/ +**__pycache__/ +Dockerfile +docker-compose.yml diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..145a1fc8 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,22 @@ +FROM python:3.12.13-slim +LABEL maintainer="illaredka8@gmail.com" + +ENV PYTHONUNBUFFERED=1 + +WORKDIR /app + +COPY requirements.txt requirements.txt +RUN pip install -r requirements.txt + +COPY . . +RUN mkdir -p /files/media + +RUN adduser \ + --disabled-password \ + --no-create-home \ + my_user + +RUN chown -R my_user /files/media +RUN chmod -R 755 /files/media + +USER my_user diff --git a/cinema/management/__init__.py b/cinema/management/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/cinema/management/commands/__init__.py b/cinema/management/commands/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/cinema/management/commands/wait_for_db.py b/cinema/management/commands/wait_for_db.py new file mode 100644 index 00000000..f4c0fb49 --- /dev/null +++ b/cinema/management/commands/wait_for_db.py @@ -0,0 +1,23 @@ +import time + +from django.core.management.base import BaseCommand +from django.db import connections +from django.db.utils import OperationalError + + +class Command(BaseCommand): + help = "Wait for database to be available" # noqa: VNE003 + + def handle(self, *args, **options): + self.stdout.write("Waiting for database...") + + db_ready = False + while not db_ready: + try: + connections["default"].ensure_connection() + db_ready = True + except OperationalError: + self.stdout.write("Database unavailable, waiting 1 second...") + time.sleep(1) + + self.stdout.write(self.style.SUCCESS("Database available!")) diff --git a/cinema_service/settings.py b/cinema_service/settings.py index 90dde772..e72e1e8a 100644 --- a/cinema_service/settings.py +++ b/cinema_service/settings.py @@ -9,6 +9,7 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/4.0/ref/settings/ """ +import os from datetime import timedelta from pathlib import Path @@ -86,8 +87,12 @@ DATABASES = { "default": { - "ENGINE": "django.db.backends.sqlite3", - "NAME": BASE_DIR / "db.sqlite3", + "ENGINE": "django.db.backends.postgresql", + "NAME": os.environ["POSTGRES_DB"], + "USER": os.environ["POSTGRES_USER"], + "PASSWORD": os.environ["POSTGRES_PASSWORD"], + "HOST": os.environ["POSTGRES_HOST"], + "PORT": os.environ["POSTGRES_PORT"], } } @@ -134,7 +139,7 @@ STATIC_URL = "static/" MEDIA_URL = "/media/" -MEDIA_ROOT = BASE_DIR / "media" +MEDIA_ROOT = "/files/media" # Default primary key field type # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..9dcfdd2f --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,33 @@ +services: + app: + build: + context: . + env_file: + - .env + ports: + - "8000:8000" + command: > + sh -c "python manage.py wait_for_db && + python manage.py migrate && + python manage.py runserver 0.0.0.0:8000" + volumes: + - ./:/app + - my_media:/files/media + depends_on: + - db + + + db: + image: postgres:16.0-alpine3.17 + restart: always + env_file: + - .env + ports: + - "5432:5432" + volumes: + - my_db:$PGDATA + + +volumes: + my_db: + my_media: diff --git a/requirements.txt b/requirements.txt index 2dc12c67..622155ff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,3 +8,4 @@ djangorestframework djangorestframework-simplejwt drf-spectacular Pillow +psycopg2-binary