From 8d56a658f661cd770f513a893d932a7be1f7443e Mon Sep 17 00:00:00 2001
From: Sergey Karmanov <ppoocpel8888@gmail.com>
Date: Fri, 21 Jun 2024 11:50:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=95=D1=89=D1=91=20=D0=B8=D1=81=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20Dockle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/Dockle.yml            | 22 ----------------------
 .gitea/workflows/gitea-push-docker.yml | 10 +++++++++-
 2 files changed, 9 insertions(+), 23 deletions(-)
 delete mode 100644 .gitea/workflows/Dockle.yml

diff --git a/.gitea/workflows/Dockle.yml b/.gitea/workflows/Dockle.yml
deleted file mode 100644
index f02bd23..0000000
--- a/.gitea/workflows/Dockle.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Dockle
-
-on:
-  workflow_run:
-    workflows: ["Create and publish a Docker image"]
-    types:
-      - completed
-
-jobs:
-  run-linters:
-    name: Run dockle
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Run dockle
-        uses: goodwithtech/dockle-action@main
-        with:
-          image: ${{ env.GITHUB_SERVER_URL }}/${{ gitea.repository }}
-          format: 'list'
-          exit-code: '1'
-          exit-level: 'warn'
-          ignore: 'CIS-DI-0001,CIS-DI-0010,DKL-DI-0006'
\ No newline at end of file
diff --git a/.gitea/workflows/gitea-push-docker.yml b/.gitea/workflows/gitea-push-docker.yml
index 6db36ae..142d8ac 100644
--- a/.gitea/workflows/gitea-push-docker.yml
+++ b/.gitea/workflows/gitea-push-docker.yml
@@ -1,4 +1,4 @@
-name: Create and publish a Docker image
+name: Build and deploy
 
 on:
   push:
@@ -46,6 +46,14 @@ jobs:
       - name: Push
         run: |
           docker push '${{ env.DOCKER_METADATA_OUTPUT_TAGS }}'
+      - name: Run dockle
+        uses: goodwithtech/dockle-action@main
+        with:
+          image: ${{ env.DOCKER_METADATA_OUTPUT_TAGS }}
+          format: 'list'
+          exit-code: '1'
+          exit-level: 'warn'
+          ignore: 'CIS-DI-0001,CIS-DI-0010,DKL-DI-0006'
      
   deploy:
     needs: build-and-push-image