diff --git a/app/bot/routers/home.py b/app/bot/routers/home.py index 6c57026..60a97c5 100644 --- a/app/bot/routers/home.py +++ b/app/bot/routers/home.py @@ -58,8 +58,8 @@ async def t_home_menu(__msg, **extra): if isinstance(__msg, types.CallbackQuery): message_id = __msg.message.message_id - elif isinstance(__msg, types.Message): - message_id = __msg.message_id + # elif isinstance(__msg, types.Message): + # message_id = __msg.message_id else: message_id = None diff --git a/app/client_bot/routers/home.py b/app/client_bot/routers/home.py index 42736d9..d3c0e36 100644 --- a/app/client_bot/routers/home.py +++ b/app/client_bot/routers/home.py @@ -59,8 +59,8 @@ async def t_home_menu(__msg, **extra): if isinstance(__msg, types.CallbackQuery): message_id = __msg.message.message_id - elif isinstance(__msg, types.Message): - message_id = __msg.message_id + # elif isinstance(__msg, types.Message): + # message_id = __msg.message_id else: message_id = None diff --git a/docker-compose.yml b/docker-compose.yml index ebfb47d..1551e05 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,12 +7,12 @@ services: env_file: - .env volumes: - - ./sqlStorage:/var/lib/mysql + - /Storage/sqlStorage:/var/lib/mysql healthcheck: test: [ "CMD", "healthcheck.sh", "--connect", "--innodb_initialized" ] interval: 10s timeout: 5s - retries: 10 + retries: 3 app: build: @@ -26,9 +26,8 @@ services: ports: - "15100:15100" volumes: - - ./logs:/app/logs - - ./storedContent:/app/data - - ./activeConfig:/app/config + - /Storage/logs:/app/logs + - /Storage/storedContent:/app/data depends_on: maria_db: condition: service_healthy @@ -43,9 +42,8 @@ services: links: - maria_db volumes: - - ./logs:/app/logs - - ./storedContent:/app/data - - ./activeConfig:/app/config + - /Storage/logs:/app/logs + - /Storage/storedContent:/app/data depends_on: maria_db: condition: service_healthy @@ -60,9 +58,8 @@ services: links: - maria_db volumes: - - ./logs:/app/logs - - ./storedContent:/app/data - - ./activeConfig:/app/config + - /Storage/logs:/app/logs + - /Storage/storedContent:/app/data depends_on: maria_db: condition: service_healthy @@ -77,9 +74,8 @@ services: links: - maria_db volumes: - - ./logs:/app/logs - - ./storedContent:/app/data - - ./activeConfig:/app/config + - /Storage/logs:/app/logs + - /Storage/storedContent:/app/data depends_on: maria_db: condition: service_healthy @@ -94,9 +90,8 @@ services: links: - maria_db volumes: - - ./logs:/app/logs - - ./storedContent:/app/data - - ./activeConfig:/app/config + - /Storage/logs:/app/logs + - /Storage/storedContent:/app/data depends_on: maria_db: condition: service_healthy