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 diff --git a/backend/pom.xml b/backend/pom.xml index 11f3025..7fc7719 100644 --- a/backend/pom.xml +++ b/backend/pom.xml @@ -5,7 +5,7 @@ ru.micord.ervu eks - 1.1.3 + 1.1.4 ru.micord.ervu.eks backend diff --git a/config-data-executor/pom.xml b/config-data-executor/pom.xml index 46c05e4..a82a7e7 100644 --- a/config-data-executor/pom.xml +++ b/config-data-executor/pom.xml @@ -6,7 +6,7 @@ ru.micord.ervu eks - 1.1.3 + 1.1.4 ru.micord.ervu.eks config-data-executor diff --git a/frontend/pom.xml b/frontend/pom.xml index 98fffac..456c755 100644 --- a/frontend/pom.xml +++ b/frontend/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu eks - 1.1.3 + 1.1.4 ru.micord.ervu.eks diff --git a/pom.xml b/pom.xml index 7144d74..bde114a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 ru.micord.ervu eks - 1.1.3 + 1.1.4 pom backend diff --git a/resources/pom.xml b/resources/pom.xml index 3a54931..9a054e2 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -4,7 +4,7 @@ ru.micord.ervu eks - 1.1.3 + 1.1.4 ru.micord.ervu.eks