From 5902cc2da4b5774f288d413d60d3a589ac7afde5 Mon Sep 17 00:00:00 2001
From: "Kayashov.SM" <kayshovcm@answer-42.ru>
Date: Fri, 25 Apr 2025 12:25:20 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BA=D0=B0=D1=84=D0=BA=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml | 37 +++++++------------------------------
 pom.xml        | 10 +++++-----
 2 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cf05e47..89c2d1d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,42 +4,19 @@ services:
   - docker:dind
 
 stages:
-  - stop-old
-  - build app
-  - build docker
-  - deploy
-
+  - deploy front
+  - deploy back
 
 stop-job:
-  stage: stop-old
+  stage: deploy back
   only:
     - master
   script:
-    - echo "Stop old container..."
+    - echo "Остановка старого контейнера"
     - docker stop my-bar
     - docker rm my-bar
-
-maven-build:
-  image: maven:3.6.3-openjdk-17-slim
-  stage: build app
-  script: "mvn -am clean package"
-  only:
-    - master
-  artifacts:
-    paths:
-      - target/*.jar
-
-docker-build:
-  stage: build docker
-  only:
-    - back_release
-  script:
+    - echo "Сборка образа докер"
     - docker build -t my-bar .
-
-deploy-job:
-  stage: deploy
-  script:
+    - echo "Запуск докер контейнера"
     - docker run --name my-bar --restart=always -p 8091:8080 -d my-bar
-    - echo "Deploy complete"
-  only:
-    - back_release
\ No newline at end of file
+    - echo "Деплой завершен"
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 63917e3..e009fba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,11 +89,11 @@
             <artifactId>lombok</artifactId>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.kafka</groupId>
-            <artifactId>spring-kafka</artifactId>
-            <version>3.2.4</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springframework.kafka</groupId>-->
+<!--            <artifactId>spring-kafka</artifactId>-->
+<!--            <version>3.2.4</version>-->
+<!--        </dependency>-->
     </dependencies>
 
     <build>