From f6a2c1fa30f596371bacad1cd8dcf231570222b3 Mon Sep 17 00:00:00 2001 From: geekiot Date: Fri, 22 Aug 2025 17:59:00 +0700 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=BE=D1=80=D1=82=D1=84=D0=BE=D0=BB?= =?UTF-8?q?=D0=B8=D0=BE:=20=D0=9F=D0=B0=D0=BF=D0=BA=D0=B0=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D1=80=D0=B0=D0=B7=D0=B2=D0=B5=D1=80=D1=82=D0=BA=D0=B8?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=20Docker?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile => Docker/Dockerfile | 1 - .../docker-compose.yaml | 33 +++++++++---------- 2 files changed, 16 insertions(+), 18 deletions(-) rename Dockerfile => Docker/Dockerfile (99%) rename docker-compose.yml => Docker/docker-compose.yaml (89%) diff --git a/Dockerfile b/Docker/Dockerfile similarity index 99% rename from Dockerfile rename to Docker/Dockerfile index ddc8a6d..ebcd47c 100644 --- a/Dockerfile +++ b/Docker/Dockerfile @@ -12,4 +12,3 @@ RUN pip3 install -r requirements.txt RUN chmod 755 . COPY . . - diff --git a/docker-compose.yml b/Docker/docker-compose.yaml similarity index 89% rename from docker-compose.yml rename to Docker/docker-compose.yaml index eef5e07..9631dcf 100644 --- a/docker-compose.yml +++ b/Docker/docker-compose.yaml @@ -1,17 +1,27 @@ -version: "3" - services: + bot: + build: + context: .. + dockerfile: Docker/Dockerfile + command: sh -c "pybabel compile -d ./Mousey/Locales -D bot && python -m Mousey to_update_telegram_profile" + container_name: mousey_bot + restart: always + depends_on: + - redis + - database + redis: image: redis:latest - container_name: ${REDIS_HOST} - restart: on-failure command: - redis-server + container_name: ${REDIS_HOST} + restart: on-failure + ports: + - ${REDIS_PORT}:${REDIS_PORT} environment: - REDIS_HOST=${REDIS_HOST} - REDIS_PORT=${REDIS_PORT} - ports: - - ${REDIS_PORT}:${REDIS_PORT} + database: image: postgres:15 @@ -24,16 +34,5 @@ services: POSTGRES_PASSWORD: ${POSTGRES_PASSWORD} POSTGRES_DB: ${POSTGRES_DB} - bot: - build: - context: . - dockerfile: ./Dockerfile - command: sh -c "pybabel compile -d ./Mousey/Locales -D bot && python -m Mousey to_update_telegram_profile" - restart: always - depends_on: - - redis - - database - volumes: pgdata: -