From 3282b7bb8ba10810316f73cb2f56ad9b0b12da23 Mon Sep 17 00:00:00 2001
From: Pavel Zilke <pavel.zilke@gmail.com>
Date: Fri, 21 Nov 2025 14:18:19 +0300
Subject: [PATCH 1/2] Update Dockerfile for RT-SK

---
 Dockerfile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 501b91d..f8d8572 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,14 +1,14 @@
-ARG BUILDER_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/node:20.9-alpine-git
-ARG RUNTIME_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/ervu/jdk:17.0.13-alpine-3.21
+ARG BUILDER_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/alpine:3.22.1
+ARG RUNTIME_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/alpine:3.22.1
 
 
 FROM $BUILDER_IMAGE AS builder
 
 ARG MVN_FLAGS="-T4C -Pprod --batch-mode --no-transfer-progress"
 
-RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/main" >> /etc/apk/repositories \
- && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \
- && apk --update --no-cache add maven openjdk17-jdk
+RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/main" >> /etc/apk/repositories \
+ && echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/community" >> /etc/apk/repositories \
+ && apk --update --no-cache add git maven nodejs npm openjdk21-jdk
 
 ENV LANG=ru_RU.UTF-8
 ENV LANGUAGE=ru_RU.UTF-8
@@ -22,15 +22,15 @@ RUN mkdir -p /root/.m2 \
  && mvn clean ${MVN_FLAGS} \
  && mvn package ${MVN_FLAGS}
 
-RUN cd config-data-executor \
- && mvn clean package ${MVN_FLAGS}
-
 
 FROM $RUNTIME_IMAGE
 
 RUN rm -f /etc/apk/repositories \
- && echo "https://dl-cdn.alpinelinux.org/alpine/v3.21/main" >> /etc/apk/repositories \
- && apk --update --no-cache add nginx
+ && echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/main" >> /etc/apk/repositories \
+ && echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/community" >> /etc/apk/repositories \
+ && apk update \
+ && apk upgrade \
+ && apk --no-cache add nginx openjdk21-jre-headless
 
 ENV BACKEND_URL=http://localhost:8080
 ENV CONFIG_DATA_EXECUTOR_URL=http://localhost:8080/api

From e3d9a7098a92e8b8a4cdb7a59dd19015a01d5e53 Mon Sep 17 00:00:00 2001
From: Eduard Tihomiorv <tikhomirov@micord.ru>
Date: Fri, 21 Nov 2025 14:31:16 +0300
Subject: [PATCH 2/2] Update for next development version

---
 backend/pom.xml              | 2 +-
 config-data-executor/pom.xml | 2 +-
 frontend/pom.xml             | 2 +-
 pom.xml                      | 2 +-
 resources/pom.xml            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 11f3025..e20abc3 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>backend</artifactId>
diff --git a/config-data-executor/pom.xml b/config-data-executor/pom.xml
index 46c05e4..21e3529 100644
--- a/config-data-executor/pom.xml
+++ b/config-data-executor/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>config-data-executor</artifactId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index 98fffac..e8d9367 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>
diff --git a/pom.xml b/pom.xml
index 7144d74..9e4483d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>ru.micord.ervu</groupId>
   <artifactId>eks</artifactId>
-  <version>1.1.3</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>
diff --git a/resources/pom.xml b/resources/pom.xml
index 3a54931..94ea280 100644
--- a/resources/pom.xml
+++ b/resources/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.2.0-SNAPSHOT</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>