From 4ea65435452bdc28f991de36f8c50114b2366687 Mon Sep 17 00:00:00 2001
From: Sergey Karmanov <ppoocpel8888@gmail.com>
Date: Fri, 21 Jun 2024 09:26:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BD=D0=B0=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B8=D0=BB=20=D0=B0=D0=BD=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=B0=D1=82=D0=BE=D1=80=20=D0=B4=D0=BE=D0=BA=D0=B5=D1=80?=
 =?UTF-8?q?=20=D0=BA=D0=BE=D0=BD=D1=82=D0=B5=D0=B9=D0=BD=D0=B5=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2?=
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 |  7 ++++---
 2 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 .gitea/workflows/Dockle.yml

diff --git a/.gitea/workflows/Dockle.yml b/.gitea/workflows/Dockle.yml
new file mode 100644
index 0000000..f02bd23
--- /dev/null
+++ b/.gitea/workflows/Dockle.yml
@@ -0,0 +1,22 @@
+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 33e68fd..6db36ae 100644
--- a/.gitea/workflows/gitea-push-docker.yml
+++ b/.gitea/workflows/gitea-push-docker.yml
@@ -16,14 +16,14 @@ jobs:
       contents: read
       packages: write
 
-    steps:
+    steps: 
       - name: Checkout repository
         uses: actions/checkout@v3
       - name: Extract metadata (tags, labels) for Docker
         id: meta
         uses: https://github.com/docker/metadata-action@v4
         with:
-          images: ${{ env.GITHUB_SERVER_URL }}/${{ gitea.repository }}
+          images: ${{ vars.SERVER_DOMAIN }}/${{ gitea.repository }}
       - name: Build an image from Dockerfile
         run: |
           cd ${{ env.CONTEXT }} &&
@@ -40,12 +40,13 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
         with:
-          registry: ${{ env.GITHUB_SERVER_URL }}
+          registry: ${{ vars.SERVER_DOMAIN }}
           username: ${{ gitea.actor }}
           password: ${{ secrets.TOKEN }}
       - name: Push
         run: |
           docker push '${{ env.DOCKER_METADATA_OUTPUT_TAGS }}'
+     
   deploy:
     needs: build-and-push-image
     runs-on: ubuntu-latest