From 3b5553e3f9efc922a537c5446153aec1d81c57e8 Mon Sep 17 00:00:00 2001
From: Dima YaFlay <93622229+YaFlay@users.noreply.github.com>
Date: Sun, 22 Oct 2023 13:54:16 +0300
Subject: [PATCH 1/3] Update docker-image.yml

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

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 2adb1bc..5fe7cc7 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -4,9 +4,9 @@ on:
   release:
     types: [published]
   push:
-    types: [latest]
+    types: [published]
   pull_request:
-    types: [latest]
+    types: [published]
 
 jobs:
   push_to_registries:

From 5aaf88c75e7d12464669cfb73925f9de06025c2a Mon Sep 17 00:00:00 2001
From: Dima YaFlay <93622229+YaFlay@users.noreply.github.com>
Date: Sun, 22 Oct 2023 13:55:45 +0300
Subject: [PATCH 2/3] Delete dockerio from packages

---
 .github/workflows/docker-image.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 5fe7cc7..640ca08 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -18,13 +18,7 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
-      
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-      
+        
       - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -37,7 +31,6 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
-            yaflay/yaflay.ru
             ghcr.io/${{ github.repository }}
       
       - name: Build and push Docker images

From 40174868779d58aeb5a3b7c01bf66e703a2842e9 Mon Sep 17 00:00:00 2001
From: Dima YaFlay <93622229+YaFlay@users.noreply.github.com>
Date: Sun, 22 Oct 2023 13:58:33 +0300
Subject: [PATCH 3/3] Update docker-image.yml

---
 .github/workflows/docker-image.yml | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
index 640ca08..3df7be7 100644
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -4,9 +4,11 @@ on:
   release:
     types: [published]
   push:
-    types: [published]
+    branches: [ "master" ]
+    
   pull_request:
-    types: [published]
+    branches: [ "master" ]
+
 
 jobs:
   push_to_registries:
@@ -18,7 +20,13 @@ jobs:
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
-        
+      
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+      
       - name: Log in to the Container registry
         uses: docker/login-action@v2
         with:
@@ -31,6 +39,7 @@ jobs:
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
           images: |
+            yaflay/yaflay.ru
             ghcr.io/${{ github.repository }}
       
       - name: Build and push Docker images