From 182e248cc00142cfc8f016def7da5fd8738e4dfe Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Tue, 21 Mar 2023 18:47:04 +0500
Subject: [PATCH 01/19] Create main.yml

---
 .github/workflows/main.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 .github/workflows/main.yml

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000000..3eeee1f096
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,19 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  build:
+    runs-on: ubuntu-lastest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Run a one-line script
+        run: echo Hello, world!
+      - name: Run a multi-line script
+        run: |
+          echo Add other actions to build,
+          echo test, and deploy your project.

From 8bea86ff78ff028205c6187c425c0c601702889b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 18:57:26 +0500
Subject: [PATCH 02/19] add test with flake8

---
 .github/workflows/main.yml | 46 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 3eeee1f096..68397ce676 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,19 +1,35 @@
-name: CI
+# .github/workflows/**main.yml**
+name: Django-app workflow
 
-on:
-  push:
-    branches: [master]
-  pull_request:
-    branches: [master]
+on: [push]
 
 jobs:
-  build:
-    runs-on: ubuntu-lastest
+  tests:
+    # «Раннер» — создание изолированного окружения с последней версией Ubuntu 
+    runs-on: ubuntu-latest
+
     steps:
-      - uses: actions/checkout@v2
-      - name: Run a one-line script
-        run: echo Hello, world!
-      - name: Run a multi-line script
-        run: |
-          echo Add other actions to build,
-          echo test, and deploy your project.
+    # Запуск actions checkout — готового скрипта 
+    # для клонирования репозитория
+    - uses: actions/checkout@v2
+    - name: Set up Python
+      # Запуск actions setup-python — готового скрипта 
+      # для развёртывания окружения Python
+      uses: actions/setup-python@v2
+      with:
+        # Выбор версии Python
+        python-version: 3.7
+
+    - name: Install dependencies
+      run: | 
+        # обновление pip
+        python -m pip install --upgrade pip 
+        # установка flake8 и его плагинов
+        pip install flake8 pep8-naming flake8-broken-line flake8-return flake8-isort
+        # установка зависимостей
+        pip install -r requirements.txt 
+
+    - name: Test with flake8 and django tests
+      run: |
+        # запуск проверки проекта по flake8
+        python -m flake8
\ No newline at end of file

From 6bb3d7d47d89fd4f39f4481709f41eabc960381a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:05:05 +0500
Subject: [PATCH 03/19] add setup.cfg

---
 infra_project/infra_app/tests.py    |  1 +
 infra_project/infra_project/urls.py |  2 +-
 setup.cfg                           | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 setup.cfg

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 77c89862cb..dc049b18d9 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -1,4 +1,5 @@
 from http import HTTPStatus
+
 from django.test import Client, TestCase
 
 
diff --git a/infra_project/infra_project/urls.py b/infra_project/infra_project/urls.py
index 10c002baed..c6a29369be 100644
--- a/infra_project/infra_project/urls.py
+++ b/infra_project/infra_project/urls.py
@@ -14,7 +14,7 @@
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import include, path
 
 urlpatterns = [
     path('', include('infra_app.urls', namespace='infra_app')),
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000..52cdd9f7aa
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,12 @@
+[flake8]
+ignore =
+    W503,
+    F811
+exclude =
+    tests/,
+    */migrations/,
+    venv/,
+    env/
+per-file-ignores =
+    */settings.py:E501
+max-complexity = 10
\ No newline at end of file

From 2c282c9abe341ef084c50090f94697a95791ae55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:08:41 +0500
Subject: [PATCH 04/19] add tests

---
 .github/workflows/main.yml | 36 +++++++++++++++++++++++++++++++++++-
 1 file changed, 35 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 68397ce676..751a73800e 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -32,4 +32,38 @@ jobs:
     - name: Test with flake8 and django tests
       run: |
         # запуск проверки проекта по flake8
-        python -m flake8
\ No newline at end of file
+        python -m flake8
+
+name: Django-app workflow
+
+on: [push]
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.7
+
+    - name: Install dependencies
+      run: | 
+        # обновление pip
+        python -m pip install --upgrade pip 
+        # установка flake8 и его плагинов
+        pip install flake8 pep8-naming flake8-broken-line flake8-return flake8-isort
+        # установка зависимостей
+        pip install -r requirements.txt 
+
+    - name: Test with flake8 and django tests
+      run: |
+        # запуск проверки проекта по flake8
+        python -m flake8
+        # перейти в папку, содержащую manage.py — 
+        #<корневая_папка_infra_actions>/<папка_проекта>/manage.py
+        cd infra_project/
+        # запустить написанные разработчиком тесты
+        python manage.py test

From 063912ef78aaf84243048a7a836f8b96fb861fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:14:56 +0500
Subject: [PATCH 05/19] add tests2

---
 .github/workflows/main.yml | 36 ------------------------------------
 1 file changed, 36 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 751a73800e..f3c5091569 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,39 +1,3 @@
-# .github/workflows/**main.yml**
-name: Django-app workflow
-
-on: [push]
-
-jobs:
-  tests:
-    # «Раннер» — создание изолированного окружения с последней версией Ubuntu 
-    runs-on: ubuntu-latest
-
-    steps:
-    # Запуск actions checkout — готового скрипта 
-    # для клонирования репозитория
-    - uses: actions/checkout@v2
-    - name: Set up Python
-      # Запуск actions setup-python — готового скрипта 
-      # для развёртывания окружения Python
-      uses: actions/setup-python@v2
-      with:
-        # Выбор версии Python
-        python-version: 3.7
-
-    - name: Install dependencies
-      run: | 
-        # обновление pip
-        python -m pip install --upgrade pip 
-        # установка flake8 и его плагинов
-        pip install flake8 pep8-naming flake8-broken-line flake8-return flake8-isort
-        # установка зависимостей
-        pip install -r requirements.txt 
-
-    - name: Test with flake8 and django tests
-      run: |
-        # запуск проверки проекта по flake8
-        python -m flake8
-
 name: Django-app workflow
 
 on: [push]

From c16bc7619ad0ac16cb08db91bfadc1be4b94694a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:18:19 +0500
Subject: [PATCH 06/19] add tests3

---
 infra_project/infra_app/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index dc049b18d9..43d58f518f 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -10,10 +10,10 @@ def setUp(self):
     def test_about_url_exists_at_desired_location(self):
         """Проверка доступности страниц."""
         response = self.guest_client.get('/')
-        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
 
         response = self.guest_client.get('/second_page/')
-        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
 
     def test_page_shows_correct_content(self):
         """Проверка контента страниц."""

From d8a3f9567cbff17905dc71b9ec53fc16f5baab66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:20:55 +0500
Subject: [PATCH 07/19] add tests4

---
 infra_project/infra_app/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 43d58f518f..60ae5c1a63 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -10,10 +10,10 @@ def setUp(self):
     def test_about_url_exists_at_desired_location(self):
         """Проверка доступности страниц."""
         response = self.guest_client.get('/')
-        self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
 
         response = self.guest_client.get('/second_page/')
-        self.assertEqual(response.status_code, HTTPStatus.BAD_REQUEST)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
 
     def test_page_shows_correct_content(self):
         """Проверка контента страниц."""

From 17306f300a6f56d33574d984876ecc891cdf700a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:23:25 +0500
Subject: [PATCH 08/19] add tests5

---
 infra_project/infra_app/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 60ae5c1a63..dc049b18d9 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -13,7 +13,7 @@ def test_about_url_exists_at_desired_location(self):
         self.assertEqual(response.status_code, HTTPStatus.OK)
 
         response = self.guest_client.get('/second_page/')
-        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
 
     def test_page_shows_correct_content(self):
         """Проверка контента страниц."""

From b940cb1e23aa19c61240d91a2b376100f22a48bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:24:57 +0500
Subject: [PATCH 09/19] add tests6

---
 infra_project/infra_app/tests.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index dc049b18d9..788757be0a 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -10,10 +10,10 @@ def setUp(self):
     def test_about_url_exists_at_desired_location(self):
         """Проверка доступности страниц."""
         response = self.guest_client.get('/')
-        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
 
         response = self.guest_client.get('/second_page/')
-        self.assertEqual(response.status_code, HTTPStatus.OK)
+        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
 
     def test_page_shows_correct_content(self):
         """Проверка контента страниц."""

From dbb86f8814e341d38360ee3e9022bd2194b60c80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 19:30:24 +0500
Subject: [PATCH 10/19] add tests7

---
 infra_project/infra_app/tests.py | 4 ++--
 infra_project/infra_app/urls.py  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 788757be0a..dc049b18d9 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -10,10 +10,10 @@ def setUp(self):
     def test_about_url_exists_at_desired_location(self):
         """Проверка доступности страниц."""
         response = self.guest_client.get('/')
-        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
 
         response = self.guest_client.get('/second_page/')
-        self.assertEqual(response.status_code, HTTPStatus.NOT_FOUND)
+        self.assertEqual(response.status_code, HTTPStatus.OK)
 
     def test_page_shows_correct_content(self):
         """Проверка контента страниц."""
diff --git a/infra_project/infra_app/urls.py b/infra_project/infra_app/urls.py
index 416b10259e..c12c06e410 100644
--- a/infra_project/infra_app/urls.py
+++ b/infra_project/infra_app/urls.py
@@ -6,6 +6,6 @@
 
 urlpatterns = [
     path('', views.index, name='index'),
-    path('second/', views.second_page, name='second_page'),
+    path('/second_page/', views.second_page, name='second_page'),
 
 ]

From d34f8642120179303798500c5e8ae817149fef32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Tue, 21 Mar 2023 20:28:11 +0500
Subject: [PATCH 11/19] 8

---
 infra_project/infra_app/urls.py  | 2 +-
 infra_project/infra_app/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/urls.py b/infra_project/infra_app/urls.py
index c12c06e410..55822a6f33 100644
--- a/infra_project/infra_app/urls.py
+++ b/infra_project/infra_app/urls.py
@@ -6,6 +6,6 @@
 
 urlpatterns = [
     path('', views.index, name='index'),
-    path('/second_page/', views.second_page, name='second_page'),
+    path('second_page/', views.second_page, name='second_page'),
 
 ]
diff --git a/infra_project/infra_app/views.py b/infra_project/infra_app/views.py
index 06eb12fbd3..a5d723bb2b 100644
--- a/infra_project/infra_app/views.py
+++ b/infra_project/infra_app/views.py
@@ -6,4 +6,4 @@ def index(request):
 
 
 def second_page(request):
-    return HttpResponse('А это вторая страница')
+    return HttpResponse('А это вторая страница!')

From 511831aedd83b1d4f3baa33a6c556b48aab827bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Thu, 23 Mar 2023 22:52:45 +0500
Subject: [PATCH 12/19] +docker

---
 infra_project/infra_app/tests.py | 2 +-
 infra_project/infra_app/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index dc049b18d9..4b93ec1023 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -21,4 +21,4 @@ def test_page_shows_correct_content(self):
         self.assertContains(response, 'У меня получилось!')
 
         response = self.guest_client.get('/second_page/')
-        self.assertContains(response, 'А это вторая страница!')
+        self.assertContains(response, 'А это вторая страница!!!')
diff --git a/infra_project/infra_app/views.py b/infra_project/infra_app/views.py
index a5d723bb2b..7045d632d4 100644
--- a/infra_project/infra_app/views.py
+++ b/infra_project/infra_app/views.py
@@ -6,4 +6,4 @@ def index(request):
 
 
 def second_page(request):
-    return HttpResponse('А это вторая страница!')
+    return HttpResponse('А это вторая страница!!!')

From b2c4b83faa9671bf9fb7a4e209d76ec0e0bb2dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Thu, 23 Mar 2023 23:26:47 +0500
Subject: [PATCH 13/19] +telegram

---
 infra_project/infra_app/tests.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 4b93ec1023..902a56fb33 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -21,4 +21,4 @@ def test_page_shows_correct_content(self):
         self.assertContains(response, 'У меня получилось!')
 
         response = self.guest_client.get('/second_page/')
-        self.assertContains(response, 'А это вторая страница!!!')
+        self.assertContains(response, 'А это вторая страница!!')

From b6f49d2dba2131fd503fa1b6fc543238296ef722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9D=D0=B8=D0=BA=D0=B8=D1=82=D0=B0=20=D0=9E=D1=81=D1=82?=
 =?UTF-8?q?=D0=B0=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE?=
 <nikitaostapenko0968@gmail.com>
Date: Thu, 23 Mar 2023 23:32:34 +0500
Subject: [PATCH 14/19] fix telegram

---
 infra_project/infra_app/tests.py | 2 +-
 infra_project/infra_app/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/infra_project/infra_app/tests.py b/infra_project/infra_app/tests.py
index 902a56fb33..dc049b18d9 100644
--- a/infra_project/infra_app/tests.py
+++ b/infra_project/infra_app/tests.py
@@ -21,4 +21,4 @@ def test_page_shows_correct_content(self):
         self.assertContains(response, 'У меня получилось!')
 
         response = self.guest_client.get('/second_page/')
-        self.assertContains(response, 'А это вторая страница!!')
+        self.assertContains(response, 'А это вторая страница!')
diff --git a/infra_project/infra_app/views.py b/infra_project/infra_app/views.py
index 7045d632d4..a5d723bb2b 100644
--- a/infra_project/infra_app/views.py
+++ b/infra_project/infra_app/views.py
@@ -6,4 +6,4 @@ def index(request):
 
 
 def second_page(request):
-    return HttpResponse('А это вторая страница!!!')
+    return HttpResponse('А это вторая страница!')

From afd39547716db4da874e2ff8b1519f94b75308d1 Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Thu, 23 Mar 2023 23:34:08 +0500
Subject: [PATCH 15/19] Update main.yml

---
 .github/workflows/main.yml | 51 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3c5091569..54e6d63450 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -31,3 +31,54 @@ jobs:
         cd infra_project/
         # запустить написанные разработчиком тесты
         python manage.py test
+
+  build_and_push_to_docker_hub:
+    name: Push Docker image to Docker Hub
+    runs-on: ubuntu-latest
+    needs: tests
+    steps:
+      - name: Check out the repo
+        # Проверка доступности репозитория Docker Hub для workflow
+        uses: actions/checkout@v2 
+      - name: Set up Docker Buildx
+        # Вызов сборщика контейнеров docker
+        uses: docker/setup-buildx-action@v1 
+      - name: Login to Docker 
+        # Запуск скрипта авторизации на Docker Hub
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      - name: Push to Docker Hub
+        # Пуш образа в Docker Hub 
+        uses: docker/build-push-action@v2 
+        with:
+          push: true
+          tags: novssk/infra_actions:latest
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build_and_push_to_docker_hub
+    steps:
+    - name: executing remote ssh commands to deploy
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USER }}
+        key: ${{ secrets.SSH_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }} # Если ваш ssh-ключ защищён фразой-паролем
+        script: |
+          # Выполняет pull образа с DockerHub
+          sudo docker pull ${{ secrets.DOCKER_USERNAME }}/infra_actions
+          #остановка всех контейнеров
+          sudo docker stop $(sudo docker ps -a -q)
+          sudo docker run --rm -d -p 5000:5000 ${{ secrets.DOCKER_USERNAME }}/infra_actions
+  send_message:
+  runs-on: ubuntu-latest
+  needs: deploy
+  steps:
+  - name: send message
+    uses: appleboy/telegram-action@master
+    with:
+      to: ${{ secrets.TELEGRAM_TO }}
+      token: ${{ secrets.TELEGRAM_TOKEN }}
+      message: ${{ github.workflow }} успешно выполнен!

From 9e12fe93c55529340b522c288d007cdf8351aeec Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Thu, 23 Mar 2023 23:35:30 +0500
Subject: [PATCH 16/19] Update main.yml

---
 .github/workflows/main.yml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 54e6d63450..613696362c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -73,12 +73,12 @@ jobs:
           sudo docker stop $(sudo docker ps -a -q)
           sudo docker run --rm -d -p 5000:5000 ${{ secrets.DOCKER_USERNAME }}/infra_actions
   send_message:
-  runs-on: ubuntu-latest
-  needs: deploy
-  steps:
-  - name: send message
-    uses: appleboy/telegram-action@master
-    with:
-      to: ${{ secrets.TELEGRAM_TO }}
-      token: ${{ secrets.TELEGRAM_TOKEN }}
-      message: ${{ github.workflow }} успешно выполнен!
+   runs-on: ubuntu-latest
+   needs: deploy
+   steps:
+    - name: send message
+      uses: appleboy/telegram-action@master
+      with:
+        to: ${{ secrets.TELEGRAM_TO }}
+        token: ${{ secrets.TELEGRAM_TOKEN }}
+        message: ${{ github.workflow }} успешно выполнен!

From 9448d2d6eb3d50bb71bdd5a2e0987d817aa4a746 Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Thu, 23 Mar 2023 23:58:54 +0500
Subject: [PATCH 17/19] Update main.yml

---
 .github/workflows/main.yml | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 613696362c..deec80b50a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,26 +55,9 @@ jobs:
         with:
           push: true
           tags: novssk/infra_actions:latest
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build_and_push_to_docker_hub
-    steps:
-    - name: executing remote ssh commands to deploy
-      uses: appleboy/ssh-action@master
-      with:
-        host: ${{ secrets.HOST }}
-        username: ${{ secrets.USER }}
-        key: ${{ secrets.SSH_KEY }}
-        passphrase: ${{ secrets.PASSPHRASE }} # Если ваш ssh-ключ защищён фразой-паролем
-        script: |
-          # Выполняет pull образа с DockerHub
-          sudo docker pull ${{ secrets.DOCKER_USERNAME }}/infra_actions
-          #остановка всех контейнеров
-          sudo docker stop $(sudo docker ps -a -q)
-          sudo docker run --rm -d -p 5000:5000 ${{ secrets.DOCKER_USERNAME }}/infra_actions
   send_message:
    runs-on: ubuntu-latest
-   needs: deploy
+   needs: build_and_push_to_docker_hub
    steps:
     - name: send message
       uses: appleboy/telegram-action@master

From 865f189fcd03c0ec037f44443ff15dc1e3c32c8e Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:04:52 +0500
Subject: [PATCH 18/19] Update main.yml

---
 .github/workflows/main.yml | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index deec80b50a..ba4dc64ad2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -55,10 +55,27 @@ jobs:
         with:
           push: true
           tags: novssk/infra_actions:latest
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build_and_push_to_docker_hub
+    steps:
+    - name: executing remote ssh commands to deploy
+      uses: appleboy/ssh-action@master
+      with:
+        host: ${{ secrets.HOST }}
+        username: ${{ secrets.USER }}
+        key: ${{ secrets.SSH_KEY }}
+        passphrase: ${{ secrets.PASSPHRASE }} # Если ваш ssh-ключ защищён фразой-паролем
+        script: |
+          # Выполняет pull образа с DockerHub
+          sudo docker pull ${{ secrets.DOCKER_USERNAME }}/infra_actions
+          #остановка всех контейнеров
+          sudo docker stop $(sudo docker ps -a -q)
+          sudo docker run --rm -d -p 5000:5000 ${{ secrets.DOCKER_USERNAME }}/infra_actions
   send_message:
-   runs-on: ubuntu-latest
-   needs: build_and_push_to_docker_hub
-   steps:
+    runs-on: ubuntu-latest
+    needs: deploy
+    steps:
     - name: send message
       uses: appleboy/telegram-action@master
       with:

From 675b63ab31680a351db38f116a3216b06f20b171 Mon Sep 17 00:00:00 2001
From: iamksan <100287657+iamksan@users.noreply.github.com>
Date: Fri, 24 Mar 2023 13:23:02 +0500
Subject: [PATCH 19/19] Update main.yml

---
 .github/workflows/main.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ba4dc64ad2..055920f0ed 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -68,10 +68,10 @@ jobs:
         passphrase: ${{ secrets.PASSPHRASE }} # Если ваш ssh-ключ защищён фразой-паролем
         script: |
           # Выполняет pull образа с DockerHub
-          sudo docker pull ${{ secrets.DOCKER_USERNAME }}/infra_actions
+          sudo docker pull novssk/infra_actions
           #остановка всех контейнеров
           sudo docker stop $(sudo docker ps -a -q)
-          sudo docker run --rm -d -p 5000:5000 ${{ secrets.DOCKER_USERNAME }}/infra_actions
+          sudo docker run --rm -d -p 5000:5000 novssk/infra_actions
   send_message:
     runs-on: ubuntu-latest
     needs: deploy