micord/ervu-account-applications
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DEVOPS-1893 fix Dockerfile

Browse source
This commit is contained in:
Pavel Zilke 2024-12-25 00:22:43 +03:00
parent a7b5397ecf
commit 115c2a0a78
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config/Dockerfile
View file

@ -1,5 +1,5 @@
ARG BUILDER_IMAGE=registry.altlinux.org/basealt/altsp:c10f1
ARG BACKEND_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240903
ARG BACKEND_IMAGE=repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20241225
ARG FRONTEND_IMAGE=nginx:1.24-alpine-slim
FROM $BUILDER_IMAGE AS builder
@ -25,7 +25,6 @@ RUN mkdir -p $HOME/.m2 \
FROM $BACKEND_IMAGE AS backend
ARG ADMIN_PASSWORD=Secr3t
USER root
@ -37,7 +36,7 @@ RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
USER tomcat
COPY --from=builder /app/backend/target/account-applications.war /var/lib/tomcat/webapps/ul.war
COPY --from=builder /app/backend/target/account-applications.war /var/lib/tomcat/webapps/account-applications.war
FROM backend AS combo
COPY --from=builder /app/frontend/target/frontend*.war /var/lib/tomcat/webapps/ROOT.war

6
config/Dockerfile.TC
View file

@ -1,17 +1,13 @@
#Dockerfile for TeamCity build "run in docker"
FROM repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20240917
FROM repo.micord.ru/alt/alt-tomcat:c10f1-9.0.59-20241225
ARG ADMIN_PASSWORD=Secr3t
USER root
RUN apt-get update \
&& apt-get -y install fonts-ttf-ms
COPY tomcat /
RUN cat /etc/tomcat/webbpm.properties >> /etc/tomcat/catalina.properties \
&& sed -i -r "s/<must-be-changed>/$ADMIN_PASSWORD/g" /etc/tomcat/tomcat-users.xml \
&& chown root:tomcat /var/lib/tomcat/webapps \
&& chmod g+rw /var/lib/tomcat/webapps