From c7252cdb0298d1d7be0765bd21e1710f391f3972 Mon Sep 17 00:00:00 2001
From: "Kayashov.SM" <kayshovcm@answer-42.ru>
Date: Fri, 25 Apr 2025 11:42:05 +0400
Subject: [PATCH] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=81i-cd=2014?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml |  4 ++--
 Dockerfile     | 16 ++++++++++++----
 Dockerfile-old | 12 ------------
 Dockerfile-omn |  4 ++++
 4 files changed, 18 insertions(+), 18 deletions(-)
 delete mode 100644 Dockerfile-old
 create mode 100644 Dockerfile-omn

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e84489d..4e1dc2d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,7 +13,7 @@ stages:
 stop-job:
   stage: stop-old
   only:
-    - master
+    - back_release
   script:
     - echo "Stop old container..."
     - docker stop my-bar
@@ -24,7 +24,7 @@ maven-build:
   stage: build app
   script: "mvn -am clean package"
   only:
-    - back_release
+    - master
   artifacts:
     paths:
       - target/*.jar
diff --git a/Dockerfile b/Dockerfile
index f01a0c4..77c23eb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,12 @@
-FROM openjdk:17-jdk-slim
-VOLUME /tmp
-ADD /target/*.jar my-bar.jar
-ENTRYPOINT "java", "-jar", "/my-bar.jar"
\ No newline at end of file
+# Создание рабочей среды для сборки
+FROM maven:3.6.3-openjdk-17-slim as build
+RUN mkdir -p /build/source
+COPY . /build/source
+WORKDIR /build/source
+RUN mvn -pl myBar -am clean package
+# Создание образа my-bar
+FROM openjdk:17-jdk-slim as my-bar
+COPY  --from=build /build/source/myBar/target/*jar /data/app/my-bar.jar
+WORKDIR /data/app
+EXPOSE 8080
+ENTRYPOINT "java" $JAVA_OPTS "-jar" "/data/app/my-bar.jar"
\ No newline at end of file
diff --git a/Dockerfile-old b/Dockerfile-old
deleted file mode 100644
index 77c23eb..0000000
--- a/Dockerfile-old
+++ /dev/null
@@ -1,12 +0,0 @@
-# Создание рабочей среды для сборки
-FROM maven:3.6.3-openjdk-17-slim as build
-RUN mkdir -p /build/source
-COPY . /build/source
-WORKDIR /build/source
-RUN mvn -pl myBar -am clean package
-# Создание образа my-bar
-FROM openjdk:17-jdk-slim as my-bar
-COPY  --from=build /build/source/myBar/target/*jar /data/app/my-bar.jar
-WORKDIR /data/app
-EXPOSE 8080
-ENTRYPOINT "java" $JAVA_OPTS "-jar" "/data/app/my-bar.jar"
\ No newline at end of file
diff --git a/Dockerfile-omn b/Dockerfile-omn
new file mode 100644
index 0000000..f01a0c4
--- /dev/null
+++ b/Dockerfile-omn
@@ -0,0 +1,4 @@
+FROM openjdk:17-jdk-slim
+VOLUME /tmp
+ADD /target/*.jar my-bar.jar
+ENTRYPOINT "java", "-jar", "/my-bar.jar"
\ No newline at end of file