From abcc03239433919a678b9f65db0b7b07640144fb Mon Sep 17 00:00:00 2001
From: zorn <zorn7@yandex.ru>
Date: Sat, 28 Dec 2024 11:15:38 +1000
Subject: [PATCH 1/3] Move ecvi_pms_plugin log to var/log

---
 pms_integration/plugins/ecvi_pms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pms_integration/plugins/ecvi_pms.py b/pms_integration/plugins/ecvi_pms.py
index 777c37b5..fb4a8849 100644
--- a/pms_integration/plugins/ecvi_pms.py
+++ b/pms_integration/plugins/ecvi_pms.py
@@ -27,7 +27,7 @@ class EcviPMSPlugin(BasePMSPlugin):
         # Настройка логгера
         self.logger = logging.getLogger(self.__class__.__name__)
         handler_console = logging.StreamHandler()
-        handler_file = logging.FileHandler('ecvi_pms_plugin.log')
+        handler_file = logging.FileHandler('var/log/ecvi_pms_plugin.log')
         formatter = logging.Formatter('%(asctime)s - %(levelname)s - %(message)s')
         handler_console.setFormatter(formatter)
         handler_file.setFormatter(formatter)

From 5eae2d1b56c45ed291a49ee71bcd5344128b6dd4 Mon Sep 17 00:00:00 2001
From: zorn <zorn7@yandex.ru>
Date: Sun, 29 Dec 2024 21:55:41 +1000
Subject: [PATCH 2/3] Wait while db container is started

---
 docker-compose.yaml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 46e790e7..5f09d867 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,6 +7,11 @@ services:
             - MYSQL_DATABASE=touchh
             - MYSQL_USER=touchh
             - MYSQL_PASSWORD=${MYSQL_PASSWORD:-touchh}
+        healthcheck:
+            test: mariadb -utouchh -p${MYSQL_PASSWORD:-touchh} -e 'SELECT 1;' touchh
+            interval: 1s
+            timeout: 10s
+            retries: 10
         volumes:
             - ./var/mysql:/var/lib/mysql
     bot:
@@ -15,7 +20,9 @@ services:
         image: touchh-py
         restart: on-failure
         command: ['python3', 'manage.py', 'run_bot']
-        depends_on: ['db']
+        depends_on:
+            db:
+                condition: service_healthy
         stop_signal: SIGINT
         volumes:
             - .:/app

From 0736d0957fa5c33c3a59ef4773e2a2f12db829de Mon Sep 17 00:00:00 2001
From: zorn <zorn7@yandex.ru>
Date: Sun, 29 Dec 2024 22:10:29 +1000
Subject: [PATCH 3/3] Do not copy project content in docker image

---
 .dockerignore | 1 +
 Dockerfile    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 .dockerignore

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 00000000..c4c53c80
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+/var
diff --git a/Dockerfile b/Dockerfile
index 90df7977..756ea930 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM python:3.12-alpine
 
 COPY requirements.txt /
-COPY . .
+
 RUN set -ex ;\
     apk add --no-cache musl-dev mariadb-connector-c-dev gcc ;\
     pip3 install -r /requirements.txt ;\