From 632c8606fc02bdb9cc1a422965cf845f846c7ea8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9B=D0=B5=D0=B2?= <lev@pochta.ru>
Date: Tue, 11 Nov 2025 09:15:15 +0500
Subject: [PATCH] =?UTF-8?q?=D0=92=D1=8B=D0=BD=D0=B5=D1=81=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0=20?=
 =?UTF-8?q?=D0=BF=D0=BB=D0=B0=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D1=89=D0=B8?=
 =?UTF-8?q?=D0=BA=D0=B0=20=D0=B8=D0=B7=20main.py=20=D0=B2=20Dockerfile?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile  |  2 ++
 Jenkinsfile |  2 +-
 app/main.py | 10 ++++------
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6500f43..7adb4d8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,5 +12,7 @@ COPY ./app /code/app
 
 RUN python3 -m pip install --upgrade pip
 RUN echo Y | python3 -m pip install --no-cache-dir --upgrade -r /code/requirements.txt
+# Запуск планировщика
+RUN python scheduler.py 
 
 CMD ["python", "main.py"]
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index ab1ba07..385b98d 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ pipeline {
   stages {
     stage('recreate > build > reun container') {
       steps {
-        sh "docker-compose up -d --force-recreate --build parse_saby"
+        sh "docker-compose up --force-recreate --build parse_saby"
       }
     }
   }
diff --git a/app/main.py b/app/main.py
index bf2f26d..fcfae93 100644
--- a/app/main.py
+++ b/app/main.py
@@ -24,13 +24,11 @@ def parse_data_in_list(dict_data: dict) -> list:
 print("Очиcтка лог файла")
 write_error_to_log.clear_to_log()
 
-print("1/5. Запуск парсинга сайта")
+print("1/4. Запуск парсинга сайта")
 result_dict_data = parse_saby.process_reports_parse()
-print('2/5. Предварительный парсинг')
+print('2/4. Предварительный парсинг')
 list_data = parse_data_in_list(result_dict_data)
-print("3/5. Запуск валидации")
+print("3/4. Запуск валидации")
 list_data_validated = DataValid.validate_data(list_data)
-print("4/5 Отправка данных в БД")                     
+print("4/4 Отправка данных в БД")                     
 working_database.SimpleDB().data_transfer_in_database(list_data_validated)
-print("5/5. Запуск планировщика")
-scheduler.launch_the_scheduler()