Merge branch 'hotfix/1.1.4'

Dockerfile

@@ -1,14 +1,14 @@
-ARG BUILDER_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/node:20.9-alpine-git
+ARG BUILDER_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/alpine:3.22.1
-ARG RUNTIME_IMAGE=nexus.ervu.rt-sk.ru/ervu-base/ervu/jdk:17.0.13-alpine-3.21
+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 \
+RUN echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/main" >> /etc/apk/repositories \
- && echo "https://dl-cdn.alpinelinux.org/alpine/v3.18/community" >> /etc/apk/repositories \
+ && echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/community" >> /etc/apk/repositories \
- && apk --update --no-cache add maven openjdk17-jdk
+ && 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 \
+ && echo "https://dl-cdn.alpinelinux.org/alpine/v3.22/main" >> /etc/apk/repositories \
- && apk --update --no-cache add nginx
+ && 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

backend/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>backend</artifactId>

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.1.4</version>
   </parent>
   <groupId>ru.micord.ervu.eks</groupId>
   <artifactId>config-data-executor</artifactId>

frontend/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>

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.1.4</version>
   <packaging>pom</packaging>
   <modules>
     <module>backend</module>

resources/pom.xml

@@ -4,7 +4,7 @@
   <parent>
     <groupId>ru.micord.ervu</groupId>
     <artifactId>eks</artifactId>
-    <version>1.1.3</version>
+    <version>1.1.4</version>
   </parent>
 
   <groupId>ru.micord.ervu.eks</groupId>