From b9ddeb53031829fcc9031df946922c4e0ac61566 Mon Sep 17 00:00:00 2001 From: Slfhstd Date: Wed, 11 Mar 2026 18:25:51 +0000 Subject: [PATCH] --- Dockerfile | 16 ++-------------- docker-compose.yml | 7 ------- entrypoint.sh | 6 ------ 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 entrypoint.sh diff --git a/Dockerfile b/Dockerfile index 67c0f8d..0ff79f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,27 +2,15 @@ FROM python:3.11-slim # Create a non-root user for running the bot -RUN groupadd -g ${GROUP_ID:-1000} botgroup && \ - useradd -u ${USER_ID:-1000} -g botgroup -m botuser - WORKDIR /app COPY requirements.txt . RUN pip install --no-cache-dir -r requirements.txt COPY bot.py . COPY config.py . -COPY entrypoint.sh . - -# Make entrypoint.sh executable -RUN chmod +x /app/entrypoint.sh - -# Create DB directory with proper permissions -RUN mkdir -p /app/DB && chown -R botuser:botgroup /app +# Create DB directory +RUN mkdir -p /app/DB ENV PYTHONUNBUFFERED=1 -# Switch to non-root user -USER botuser - -ENTRYPOINT ["/app/entrypoint.sh"] CMD ["python", "bot.py"] diff --git a/docker-compose.yml b/docker-compose.yml index 809f8cb..0052c61 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,15 +1,8 @@ services: testpostsbot: image: slfhstd.uk/slfhstd/testpostsbot:dev - build: - context: . - args: - - USER_ID=${USER_ID:-1000} - - GROUP_ID=${GROUP_ID:-1000} env_file: - prod.env - user: "${USER_ID:-1000}:${GROUP_ID:-1000}" restart: unless-stopped volumes: - ./DB:/app/DB - entrypoint: ["/app/entrypoint.sh", "python", "bot.py"] diff --git a/entrypoint.sh b/entrypoint.sh deleted file mode 100644 index 1f4221f..0000000 --- a/entrypoint.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -e - -## Skipping chown for bind-mounted DB folder to avoid permission errors - -exec "$@" \ No newline at end of file