Posting-1: Config updates

.dockerignore

@@ -11,6 +11,10 @@ media/
 deploy
 docker-compose.yml
 
+# Exclude environment files (avoid baking dev secrets into image)
+.env*
+!*.dev
+
 # Python specific
 __pycache__
 *.pyc

.env.example

@@ -0,0 +1,23 @@
+PYTHONUNBUFFERED=1
+SECRET_KEY=secret
+DATABASE_URL=postgis://docker:docker@db:5432/dtpstat
+STATIC_ROOT=/static
+MEDIA_ROOT=/app/media
+STATICFILES_DIRS=/code/static
+RECAPTCHA_PUBLIC_KEY=test
+RECAPTCHA_PRIVATE_KEY=test
+DEBUG=1
+PROJECT_PATH=/code
+ALLOWED_HOSTS=*
+HERE_TOKEN=123
+YANDEX_TOKEN=123
+
+POSTGRES_DB=dtpstat
+POSTGRES_USER=docker
+POSTGRES_PASSWORD=docker
+POSTGRES_HOST_PORT=5431
+POSTGRES_INNER_PORT=5432
+
+DJANGO_SUPERUSER_USERNAME=admin
+DJANGO_SUPERUSER_EMAIL=admin@localhost
+DJANGO_SUPERUSER_PASSWORD=admin

.gitignore

@@ -102,7 +102,8 @@ celerybeat.pid
 *.sage.py
 
 # Environments
-.env
+.env*
+!.env.example
 .venv
 env/
 venv/

Dockerfile

@@ -1,6 +1,9 @@
 FROM python:3.8-bullseye
 LABEL org.opencontainers.image.source=https://github.com/dtpstat/dtp-stat
-ENV PYTHONDONTWRITEBYTECODE 1
+ENV PYTHONUNBUFFERED=1 \
+  LC_ALL=ru_RU.UTF-8 \
+  LANG=ru_RU.UTF-8 \
+  LANGUAGE=ru_RU:ru
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
   binutils \
@@ -19,7 +22,7 @@ COPY Pipfile Pipfile
 COPY Pipfile.lock Pipfile.lock
 RUN pip3 install pipenv --no-cache-dir \
     && pipenv install --deploy --system --ignore-pipfile \
-    && pipenv --clear && rm -rf $(pip cache dir)
+    && pipenv --clear && rm -rf "$(python -m pip cache dir)"
 COPY . .
 
 EXPOSE 5000

Makefile

@@ -1,8 +1,17 @@
+.PHONY: up run down clean sh build test
+
+# Replace with your compose file
+COMPOSE_FILE=docker-compose.example.yml
+
 run:
-	docker-compose up
+	docker-compose -f $(COMPOSE_FILE) up -d
+down:
+	docker-compose -f $(COMPOSE_FILE) down
+clean:
+	docker compose -f $(COMPOSE_FILE) down -v
 sh:
-	docker-compose exec web /bin/bash
+	docker-compose -f $(COMPOSE_FILE) exec -it web /bin/bash
 build:
-	docker-compose build
+	docker-compose -f $(COMPOSE_FILE) build
 test:
-	docker-compose exec web pytest
+	docker-compose -f $(COMPOSE_FILE) exec -it web pytest

Pipfile

@@ -25,13 +25,13 @@ ijson = "==2.6.1"
 pandas = "==1.3.0"
 psycopg2-binary = "==2.8.5"
 pymorphy2 = "==0.9.1"
-python-telegram-bot = "==13.0"
 scrapy-rotating-proxies = "==0.6.2"
 tqdm = "==4.65.1"
-tweepy = "==4.14.0"
 django-constance = "==4.3.2"
-#omit old package, it dep for scrapy-rotating-proxies
-typing = { version = "*", markers="python_version < '3.0'" }
+django-q = "==1.3.9"
+tweepy = "==4.14.0"
+python-telegram-bot = "==13.0"
+vk_api = "==11.10.0"
 
 [dev-packages]
 

create_superuser.py

@@ -0,0 +1,16 @@
+import os
+import django
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dtpstat.settings")
+django.setup()
+
+from django.contrib.auth import get_user_model
+
+User = get_user_model()
+
+username = os.environ.get('DJANGO_SUPERUSER_USERNAME')
+email = os.environ.get('DJANGO_SUPERUSER_EMAIL')
+password = os.environ.get('DJANGO_SUPERUSER_PASSWORD')
+
+if not User.objects.filter(username=username).exists():
+    User.objects.create_superuser(username=username, email=email, password=password)

docker-compose.example.yml

@@ -0,0 +1,70 @@
+# Example file to run your dev server
+
+# copy: 'cp docker-compose.example.yml docker-compose.yml'
+# or use 'docker compose -f docker-compose.example.yml up'
+# or just run 'make up' (Makefile handles it)
+
+services:
+  db:
+    image: kartoza/postgis:14-3.3
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    ports:
+      - "${POSTGRES_HOST_PORT}:${POSTGRES_INNER_PORT}"
+    networks:
+      - backend
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U \"$${POSTGRES_USER}\" -d \"$${POSTGRES_DB}\" -h 127.0.0.1 -p \"$${POSTGRES_INNER_PORT}\""]
+      interval: 5s       # Check health every 5 second
+      timeout: 2s        # Allow 2 seconds for response
+      retries: 10        # Retry 10 times
+      start_period: 10s  # Run checks during first 10 seconds
+      start_interval: 1s # Check every second during start_period (Docker 25.0+)
+  web:
+    build: .
+    ports:
+      - "5000:5000"
+    volumes:
+        - .:/code
+    working_dir: /code
+    # Старт: миграции + проверка суперпользователя + запуск сервера
+    command: >
+      sh -c "
+      python run_migrations.py &&
+      python create_superuser.py &&
+      python manage.py runserver 0.0.0.0:5000
+      "
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - backend
+    env_file:
+      - .env.example
+    restart: unless-stopped
+  qcluster:
+    build: .
+    command: >
+      sh -c "
+      python run_migrations.py &&
+      python manage.py qcluster
+      "
+    volumes:
+      - .:/code
+    working_dir: /code
+    depends_on:
+      db:
+        condition: service_healthy
+    networks:
+      - backend
+    env_file:
+      - .env.example
+    restart: unless-stopped
+networks:
+  backend:
+volumes:
+  pgdata:

run-migrations.py

@@ -0,0 +1,25 @@
+import os
+import sys
+from pathlib import Path
+import django
+from django.core.management import call_command
+
+# Путь к файлу-флагу в volume
+FLAG_FILE = Path("/var/lib/postgresql/data/.migrations_done")
+
+# Настройка Django
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dtpstat.settings")
+django.setup()
+
+# Проверяем, был ли уже первый запуск
+if not FLAG_FILE.exists():
+    print("Первый запуск контейнера: выполняем миграции...")
+    try:
+        call_command("migrate", interactive=False)
+        print("Миграции применены.")
+        FLAG_FILE.touch()  # создаём флаг
+    except Exception as e:
+        print("Ошибка при применении миграций:", e)
+        sys.exit(1)
+else:
+    print("Миграции уже применены, пропускаем.")