From 27f4cd61223246cfdccee483638637e4103a86ac Mon Sep 17 00:00:00 2001
From: Slava <beaconborn@yandex.ru>
Date: Wed, 29 May 2024 12:22:27 +0000
Subject: [PATCH 1/3] Update file .gitlab-ci.yml

---
 .gitlab-ci.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ec3005b..afc03a6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,10 +8,6 @@ stages:
 
 sast:
   stage: 'test'
-include:
-  - template: Security/SAST.gitlab-ci.yml
-  - template: Security/Dependency-Scanning.gitlab-ci.yml
-  - template: Security/SAST-IaC.gitlab-ci.yml
 
 pytest:
   stage: 'test'
@@ -41,15 +37,12 @@ variables:
   DOCKER_TLS_CERTDIR: ""
 
 
-services:
-  - name: docker:26.1.3-dind
-    entrypoint: [ "env", "-u", "DOCKER_HOST" ]
 
 make_image:
   stage: build
   image: docker:26.1.3-dind
   services:
-    - docker:26.1.3-dind
+    - dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 

From 95ac0caf30a40b63d4aa9cc476bb0b105aacb100 Mon Sep 17 00:00:00 2001
From: Slava <beaconborn@yandex.ru>
Date: Wed, 29 May 2024 12:23:28 +0000
Subject: [PATCH 2/3] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index afc03a6..ba73d71 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,6 @@ stages:
   - 'deploy'
   - 'push'
 
-sast:
-  stage: 'test'
-
 pytest:
   stage: 'test'
   image: python

From 899527436fc147c19121291f7f1ca742311c7bf7 Mon Sep 17 00:00:00 2001
From: Slava <beaconborn@yandex.ru>
Date: Wed, 29 May 2024 17:12:12 +0000
Subject: [PATCH 3/3] Update .gitlab-ci.yml file

---
 .gitlab-ci.yml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ba73d71..10faf08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,7 @@
 
 stages:
   - 'test'
-  - 'code_quality'
   - 'build'
-  - 'deploy'
   - 'push'
 
 pytest:
@@ -39,7 +37,7 @@ make_image:
   stage: build
   image: docker:26.1.3-dind
   services:
-    - dind
+    - docker:26.1.3-dind
   before_script:
     - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
 
@@ -69,9 +67,6 @@ Push latest:
     # We do not need GitLab to clone the source code.
     GIT_STRATEGY: none
   stage: push
-  only:
-    # Only "master" should be tagged "latest"
-    - master
   script:
     # Because we have no guarantee that this job will be picked up by the same runner
     # that built the image in the previous step, we pull it again locally