From 115c2a0a7891512a05421ab4e9e6afa67d6ea3bd Mon Sep 17 00:00:00 2001
From: Pavel Zilke <pavel.zilke@gmail.com>
Date: Wed, 25 Dec 2024 00:22:43 +0300
Subject: [PATCH] DEVOPS-1893 fix Dockerfile

---
 config/Dockerfile    | 5 ++---
 config/Dockerfile.TC | 6 +-----
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/config/Dockerfile b/config/Dockerfile
index 56d87f51..137f4e4f 100644
--- a/config/Dockerfile
+++ b/config/Dockerfile
@@ -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
diff --git a/config/Dockerfile.TC b/config/Dockerfile.TC
index 31fcb332..7523f30c 100644
--- a/config/Dockerfile.TC
+++ b/config/Dockerfile.TC
@@ -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