diff --git a/src/bot_aiogram/Dockerfile b/src/bot_aiogram/Dockerfile index 4c1780d..c09b8b4 100755 --- a/src/bot_aiogram/Dockerfile +++ b/src/bot_aiogram/Dockerfile @@ -1,15 +1,22 @@ FROM python:3.11 -ENV BOT_NAME=$BOT_NAME -WORKDIR /usr/src/app/"${BOT_NAME:-tg_bot}" +RUN apt-get update \ + && DEBIAN_FRONTEND=noninteractive \ + && apt-get install -y net-tools netcat-traditional curl \ + && apt-get clean \ + && rm -rf /var/lib/apt/lists/* -COPY pyproject.toml /usr/src/app/"${BOT_NAME:-tg_bot}"/pyproject.toml -COPY poetry.lock /usr/src/app/"${BOT_NAME:-tg_bot}"//poetry.lock -COPY poetry.toml /usr/src/app/"${BOT_NAME:-tg_bot}"/poetry.toml +RUN mkdir --parents /opt/app +COPY pyproject.toml /opt/app/pyproject.toml +COPY poetry.lock /opt/app/poetry.lock +COPY poetry.toml /opt/app/poetry.toml -WORKDIR /usr/src/app/"${BOT_NAME:-tg_bot}" +WORKDIR /opt/app RUN pip install poetry \ && poetry install --no-dev -COPY . /usr/src/app/"${BOT_NAME:-tg_bot}" +COPY bin /opt/app/bin +COPY tgbot /opt/app/tgbot + +CMD [".venv/bin/python", "-m", "bin"] diff --git a/src/bot_aiogram/docker-compose.yml b/src/bot_aiogram/docker-compose.yml index c8ef5c6..d1a1082 100755 --- a/src/bot_aiogram/docker-compose.yml +++ b/src/bot_aiogram/docker-compose.yml @@ -1,22 +1,17 @@ -version: "3.3" +version: "3" services: bot: image: "${BOT_IMAGE_NAME:-tg_bot-image}" container_name: "${BOT_CONTAINER_NAME:-tg_bot-container}" - stop_signal: SIGINT build: context: . - working_dir: "/usr/src/app/${BOT_NAME:-tg_bot}" - volumes: - - .:/usr/src/app/${BOT_NAME:-tg_bot} - command: poetry run python bot.py restart: always env_file: - - ".env" + - .env networks: - - tg_bot + - tg_bot_network networks: - tg_bot: + tg_bot_network: driver: bridge