Merge branch 'develop' into hotfix/1.1.4
This commit is contained in:
commit
33b7856adb
1 changed files with 10 additions and 10 deletions
20
Dockerfile
20
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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue