diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index 5df56e6..0000000 --- a/.dockerignore +++ /dev/null @@ -1,35 +0,0 @@ -.git -.gitignore -.DS_Store -.env -.env.* -!.env.example - -__pycache__/ -*.py[cod] -*$py.class - -.pytest_cache/ -.mypy_cache/ -.ruff_cache/ -.coverage -.coverage.* -htmlcov/ - -.idea/ -.vscode/ -.venv/ -venv/ -ENV/ -env/ - -*.db -*.db-journal -*.db-shm -*.db-wal -*.sqlite -*.sqlite3 -*.log -tgbot/data/*.db* -tgbot/data/*.sqlite* -tgbot/data/*.log diff --git a/.env.example b/.env.example index 59c5f55..4bbc81d 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,12 @@ BOT_TOKEN= BOT_ADMIN_IDS= + BOT_DATABASE_EXPORT=True BOT_STATUS_NOTIFICATION=True + BOT_TIMEZONE=Europe/Moscow BOT_USER_CACHE_TTL=300 BOT_THROTTLE_RATE=0.5 + PATH_DATABASE=tgbot/data/database.db PATH_LOGS=tgbot/data/logs.log diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 1847c07..0000000 --- a/Dockerfile +++ /dev/null @@ -1,19 +0,0 @@ -FROM python:3.11-slim - -ENV PYTHONDONTWRITEBYTECODE=1 \ - PYTHONUNBUFFERED=1 \ - PIP_NO_CACHE_DIR=1 - -WORKDIR /app - -RUN useradd --create-home --shell /usr/sbin/nologin bot - -COPY requirements.txt . -RUN pip install -r requirements.txt - -COPY --chown=bot:bot . . -RUN mkdir -p /app/tgbot/data && chown -R bot:bot /app - -USER bot - -CMD ["sh", "-c", "python migrate.py up && python main.py"] diff --git a/README.md b/README.md index 9bfc19b..683d435 100644 --- a/README.md +++ b/README.md @@ -31,11 +31,3 @@ BOT_ADMIN_IDS= ```bash python3 main.py ``` - -## Docker - -```bash -docker compose up -d --build -``` - -Контейнер сам применяет миграции перед запуском. diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index a5a285a..0000000 --- a/docker-compose.yml +++ /dev/null @@ -1,11 +0,0 @@ -services: - bot: - build: - context: . - dockerfile: Dockerfile - restart: unless-stopped - env_file: - - .env - volumes: - - ./tgbot/data:/app/tgbot/data - stop_grace_period: 30s