From dd0d966e51ccc92f50565916c502e574a8fe7a59 Mon Sep 17 00:00:00 2001
From: "Kayashov.SM" <kayshovcm@answer-42.ru>
Date: Fri, 25 Apr 2025 00:50:26 +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=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml       | 20 +++++++++++++++++++-
 Dockerfile           | 16 ++++------------
 Dockerfile-isNotWork |  4 ----
 Dockerfile-old       | 12 ++++++++++++
 4 files changed, 35 insertions(+), 17 deletions(-)
 delete mode 100644 Dockerfile-isNotWork
 create mode 100644 Dockerfile-old

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8dc8fa8..ef23685 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,24 @@ image: maven:3.6.3-openjdk-17-slim
 
 stages:
   - build
+  - docker
+
+maven-build:
+  image: maven:3.6.3-openjdk-17-slim
+  stage: build
+  script: "mvn -am clean package"
+  only:
+    - back_release
+  artifacts:
+    paths:
+      - target/*.jar
+
+docker-build:
+  stage: docker
+  script:
+    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN http://192.168.1.100:9093
+    - docker build -t gitlab.kayashov.keenetic.pro/kayashov/my-bar .
+    - docker push gitlab.kayashov.keenetic.pro/kayashov/my-bar
 
 build-job:
   stage: build
@@ -14,4 +32,4 @@ build-job:
     - "docker run --name my-bar --restart=always -p 8091:8080 -d my-bar"
     - echo "Compile complete
   only:
-    - back_release
\ No newline at end of file
+    - master
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 77c23eb..f01a0c4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,12 +1,4 @@
-# Создание рабочей среды для сборки
-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
+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
diff --git a/Dockerfile-isNotWork b/Dockerfile-isNotWork
deleted file mode 100644
index f01a0c4..0000000
--- a/Dockerfile-isNotWork
+++ /dev/null
@@ -1,4 +0,0 @@
-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
diff --git a/Dockerfile-old b/Dockerfile-old
new file mode 100644
index 0000000..77c23eb
--- /dev/null
+++ b/Dockerfile-old
@@ -0,0 +1,12 @@
+# Создание рабочей среды для сборки
+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