изменение сi-cd 14

.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

Dockerfile

@@ -1,4 +1,12 @@
-FROM openjdk:17-jdk-slim
+# Создание рабочей среды для сборки
-VOLUME /tmp
+FROM maven:3.6.3-openjdk-17-slim as build
-ADD /target/*.jar my-bar.jar
+RUN mkdir -p /build/source
-ENTRYPOINT "java", "-jar", "/my-bar.jar"
+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"

Dockerfile-old

@@ -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"

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"